Signed-off-by: cellee <893264950@qq.com>

src/models/CommunityManagement/CommunityService.ts

@@ -110,7 +110,8 @@ export default {
                       (tmp.floorNumber || tmp.communityFloor) +
                       '-' +
                       (tmp.roomNumber || tmp.communtiyRoom)
-                    : (tmp.floorNumber || tmp.communityFloor) +
+                    : ' #' +
+                      (tmp.floorNumber || tmp.communityFloor) +
                       '-' +
                       (tmp.roomNumber || tmp.communtiyRoom),
 

src/pages/CommercialService/Card.tsx

@@ -48,17 +48,17 @@ const Card = (props: any) => {
       null,
       (text: any, record: any) => (
         <>
-          {record.build_number ? <span>{record.build_number} #</span> : ''}
-          <span>{record.floor_number}-</span>
+          {record.build_number ? <span>{record.build_number}</span> : ''}
+          <span>#{record.floor_number}-</span>
           <span>{record.room_number}</span>
         </>
       ),
     ],
-    [
-      'Account Type',
-      'apply_relation_owner',
-      (text: string) => <div>{apply_relation[text][1]}</div>,
-    ],
+    // [
+    //   'Account Type',
+    //   'apply_relation_owner',
+    //   (text: string) => <div>{apply_relation[text][1]}</div>,
+    // ],
     [
       'Application Time',
       null,

src/pages/CommercialService/CardDetail.tsx

@@ -141,7 +141,7 @@ const CardDetail = (props: any) => {
               <Col span={3}>{listData.community_name}</Col>
               <Col>Unit:</Col>
               <Col>
-                {listData.build_number ? listData.build_number + ' #' : ''}
+                {listData.build_number ? listData.build_number : ''}#
                 {listData.floor_number + '-' + listData.room_number}
               </Col>
             </Row>
@@ -170,10 +170,10 @@ const CardDetail = (props: any) => {
               <Col span={3}>{listData.apply_name_phone}</Col>
               <Col>{listData.apply_name_email}</Col>
             </Row>
-            <Row gutter={8} style={{ marginTop: 16 }}>
+            {/* <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Relationship:</Col>
               <Col>{apply_relation_owner[parseInt(listData.apply_relation_owner)]}</Col>
-            </Row>
+            </Row> */}
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={4}>Decription of Work:</Col>
               <Col>

src/pages/CommercialService/MoveOutDetail.tsx

@@ -119,7 +119,7 @@ const RenovationDetail = (props: any) => {
               <Col span={3}>{onwerDetail.communityName}</Col>
               <Col>Unit:</Col>
               <Col>
-                {onwerDetail.buildingNumber ? onwerDetail.buildingNumber + ' #' : ''}
+                {onwerDetail.buildingNumber ? onwerDetail.buildingNumber : ''}#
                 {onwerDetail.floorNumber}-{onwerDetail.roomNumber}
               </Col>
             </Row>

src/pages/CommercialService/PropertyServices.tsx

@@ -72,7 +72,9 @@ const PropertyServices = (props: any) => {
     {
       title: 'Submission Time',
       dataIndex: 'create_time',
-      render: (text: any) => <Space size="middle">{moment(text.time).format('MM.DD HH:mm')}</Space>,
+      render: (text: any) => (
+        <Space size="middle">{text.time ? moment(text.time).format('MM.DD HH:mm') : ''}</Space>
+      ),
     },
     {
       title: 'Status',

src/pages/CommercialService/Renovation.tsx

@@ -51,14 +51,18 @@ const Renovation = (props: any) => {
       null,
       (text: any, record: any) => (
         <div>
-          {record.communityBuildDecorate ? <span>{record.communityBuildDecorate} #</span> : ''}
-          <span>{record.communityFloorDecorate}-</span>
+          {record.communityBuildDecorate ? <span>{record.communityBuildDecorate}</span> : ''}
+          <span>#{record.communityFloorDecorate}-</span>
           <span>{record.communityRoomDecoate}</span>
         </div>
       ),
     ],
     ['Content', 'decorationContent', (text: any) => <div>{stringTab(text)}</div>],
-    ['Application Time', 'createTime', (text: any) => moment(text.time).format('MM.DD HH:mm')],
+    [
+      'Application Time',
+      'createTime',
+      (text: any) => (text.time ? moment(text.time).format('MM.DD HH:mm') : ''),
+    ],
     ['status', 'decorationStatus', (text: any) => <div>{decorationStatus[parseInt(text)][1]}</div>],
     [
       'Actions',
@@ -85,8 +89,8 @@ const Renovation = (props: any) => {
       key: 'id',
       render: (text: any, record: any) => (
         <>
-          {record.communityBuild ? <span>{record.communityBuild} #</span> : ''}
-          <span>{record.communityFloor}-</span>
+          {record.communityBuild ? <span>{record.communityBuild}</span> : ''}
+          <span>#{record.communityFloor}-</span>
           <span>{record.communityRoom}</span>
         </>
       ),
@@ -112,8 +116,7 @@ const Renovation = (props: any) => {
       title: 'Submission Time',
       dataIndex: 'createTime',
       key: 'createTime',
-      // render: (text: any) => moment(text.time).format('MMMM Do YYYY, h:mm'),
-      render: (text: any) => moment(text.time).format('MM.DD HH:mm'),
+      render: (text: any) => (text.time ? moment(text.time).format('MM.DD HH:mm') : ''),
     },
     {
       title: 'Status',

src/pages/CommercialService/RenovationDetail.tsx

@@ -105,7 +105,7 @@ const RenovationDetail = (props: any) => {
               <Col span={3}>{onwerDetail.communityName}</Col>
               <Col>Unit:</Col>
               <Col>
-                {onwerDetail.buildingNumber ? onwerDetail.buildingNumber + ' #' : ''}
+                {onwerDetail.buildingNumber ? onwerDetail.buildingNumber : ''}#
                 {onwerDetail.floorNumber}-{onwerDetail.roomNumber}
               </Col>
             </Row>

src/pages/CommunityManagement/FacilityBookings/BookingDetail.tsx

@@ -168,8 +168,8 @@ const BookingDetail = (props: any) => {
               </Descriptions.Item>
               <Descriptions.Item label="User Name">{DataSave.accountName}</Descriptions.Item>
               <Descriptions.Item label="Unit No.">
-                {DataSave.buildNumber ? DataSave.buildNumber + ' #' : ''}
-                {DataSave.floorNumber}-{DataSave.roomNumber}
+                {DataSave.buildNumber ? DataSave.buildNumber + '' : ''}#{DataSave.floorNumber}-
+                {DataSave.roomNumber}
               </Descriptions.Item>
               <Descriptions.Item label="Contact Number">{DataSave.accountPhone}</Descriptions.Item>
             </Descriptions>

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -62,8 +62,8 @@ const Users = (props: any) => {
       render: (text: any, record: any) => (
         // <div>{record.buildingNumber + ' #' + record.floorNumber + '-' + record.roomNumber}</div>
         <div>
-          {record.buildingNumber ? <span>{record.buildingNumber} #</span> : ''}
-          <span>{record.floorNumber}-</span>
+          {record.buildingNumber ? <span>{record.buildingNumber}</span> : ''}
+          <span> #{record.floorNumber}-</span>
           <span>{record.roomNumber}</span>
         </div>
       ),

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -120,6 +120,7 @@ const UsersDetail = (props: any) => {
   // 监听数据返回
   useEffect(() => {
     if (DataSaveDetail !== null) {
+      // console.log(DataSaveDetail);
       setDataSaveLoading(false);
     }
   }, [DataSaveDetail]);