合并

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

src/components/SelectOptions/index.jsx

@@ -144,7 +144,7 @@ class SelectOptions extends React.PureComponent {
         selectoptionsSelectAll: 'Select All',
         selectoptionsSelectNone: 'Unselect All',
         selectoptionsAll: 'All',
-        selectoptionsSearchCell: 'Search cell',
+        selectoptionsSearchCell: 'Search',
         selectoptionsAllCell: ' All',
         componetVisible: 'Close',
       });

src/components/TableShow/TableShow.tsx

@@ -119,13 +119,13 @@ const TableShow = (props: any) => {
                           pagination={false}
                         ></Table>
                       </Col>
-                      <Col style={{ textAlign: 'center' }}>
+                      <Col span={4}>
                         <Row style={{ marginTop: 8 }}>
                           <div style={{ textAlign: 'center' }}>
                             <img width={80} height={80} src={unit.imgUrl} />
                             <br />
                             {item.owner.cdkCode}
-                            <br />({user_code[item.owner.cdkStatus]})
+                            <br />({user_code[item.owner.enable]})
                           </div>
                         </Row>
                       </Col>

src/components/TagSelect/index.jsx

@@ -35,10 +35,10 @@ class TagSelect extends React.Component {
       icon: <ExclamationCircleOutlined />,
       content: 'Some descriptions',
       onOk() {
-        console.log('OK');
-        console.log(removedTag);
+        // console.log('OK');
+        // console.log(removedTag);
         const value = that.state.value.filter((tag) => tag !== removedTag);
-        console.log(value);
+        // console.log(value);
         that.props.onRemove(removedTag);
         that.setState({ value });
         that.props.onChange(value);
@@ -101,8 +101,7 @@ class TagSelect extends React.Component {
 
   render() {
     const { value, inputVisible, inputValue, editInputIndex, editInputValue, visible } = this.state;
-    console.log(this.props.value);
-    console.log(value);
+
     return (
       <>
         <Tag className="editTag" key="Accountant">
@@ -114,7 +113,7 @@ class TagSelect extends React.Component {
             return (
               <Input
                 ref={this.saveEditInputRef}
-                key={tag}
+                key={tag.serviceName}
                 size="small"
                 className={styles.tagInput}
                 value={editInputValue}
@@ -125,30 +124,30 @@ class TagSelect extends React.Component {
             );
           }
 
-          const isLongTag = tag.length > 20;
+          const isLongTag = value.length > 20;
 
           const tagElem = (
             <Tag
               className="editTag"
-              key={tag}
+              key={tag.serviceName}
               closable={index !== -1}
               onClose={(e) => this.handleClose(tag, e)}
               visible={true}
             >
               <span
                 onDoubleClick={(e) => {
-                  this.setState({ editInputIndex: index, editInputValue: tag }, () => {
+                  this.setState({ editInputIndex: index, editInputValue: tag.serviceName }, () => {
                     this.editInput.focus();
                   });
                   e.preventDefault();
                 }}
               >
-                {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+                {isLongTag ? `${value.slice(0, 20)}...` : tag.serviceName}
               </span>
             </Tag>
           );
           return isLongTag ? (
-            <Tooltip title={tag} key={tag}>
+            <Tooltip title={tag.serviceName} key={tag.serviceName}>
               {tagElem}
             </Tooltip>
           ) : (

src/locales/en-US/menu.ts

@@ -54,7 +54,7 @@ export default {
   'menu.monitoringcenter': 'Monitoring Center',
   'menu.usemanagement.lifeusers': 'LIFE User Management',
   'menu.usemanagement.serviceproviders': 'Service Provider Management',
-  'menu.propertymanagement': 'Property Management',
+  'menu.propertymanagement': 'Property Fee Management',
   'menu.commercialservice': 'Commercial Service',
   'menu.commercialservice.communitymaintenance': 'Community maintenance',
   'menu.commercialservice.ownercomplaints': 'Owner Complaints',

src/pages/PropertyManagement/ChargeManager.tsx

@@ -154,7 +154,7 @@ const ChargeManager = (props: any) => {
     <div className={styles.base}>
       <TitleSearch
         listkey={['tosOwnerName']}
-        list={['TosOwnerName']}
+        list={['Name Of Owner']}
         communitySelect={true}
         onSubmit={TitleSearchContent}
         defaultValue={readyData}

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -163,7 +163,8 @@ const ServiceProviderManagement = (props: propsType) => {
         ...location.query,
       };
     }
-    // console.log(CommunityList, flag);
+    console.log(location.query);
+    console.log(readyData);
     if (CommunityList && flag === false) {
       flag = true;
       setLoading(true);

src/pages/UserManagement/ServiceProviderManagement/Services.tsx

@@ -21,13 +21,20 @@ const Services = (props: any) => {
   useEffect(() => {
     if (DataServices != null) {
       console.log(DataServices);
-      let tmp = DataServices.data.rows.map((v: object, i: number) => {
-        return v['serviceName'];
-      });
+      // let tmp = DataServices.data.rows.map((v: object, i: number) => {
+      //   return v['serviceName'];
+      // });
+      // console.log(tmp);
+      // tmp = tmp.filter((v: string) => {
+      //   return v !== 'Accountant';
+      // });
+
+      let tmp = DataServices.data.rows.filter(
+        (v: { serviceName: string; deleted: number }, i: number) => {
+          return v.serviceName !== 'Accountant' && v.deleted !== 1 && v;
+        },
+      );
       console.log(tmp);
-      tmp = tmp.filter((v: string) => {
-        return v !== 'Accountant';
-      });
       formRef.current['setFieldsValue']({ serviceName: tmp });
     }
   }, [DataServices]);
@@ -50,12 +57,12 @@ const Services = (props: any) => {
   };
 
   // 删除服务范围
-  const Remove = (values: string) => {
+  const Remove = (values: { id: string }) => {
     console.log(values);
     RA(
       53,
       {
-        serviceName: values,
+        id: values.id,
       },
       module,
       dispatch,