Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/components/TableShow/TableShow.tsx

@@ -27,6 +27,7 @@ const TableShow = (props: any) => {
 
   // const user_status = [[1, "家属"], [2, "租户"]]
   const user_status = [
+    [0, 'Other'],
     [1, 'Family Member'],
     [2, 'Tenant'],
   ];
@@ -45,7 +46,7 @@ const TableShow = (props: any) => {
       null,
       (text: any, record: any) => (
         <Space size="middle">
-          {record.owner_relationship != null ? user_status[record.owner_relationship - 1][1] : null}
+          {record.owner_relationship != null ? user_status[record.owner_relationship][1] : null}
         </Space>
       ),
     ],

src/pages/UserManagement/LIFEUserManagement/ResultPageFailed.tsx

@@ -33,13 +33,13 @@ const ResultPageFailed = () => {
         extra={[
           <Button type="primary" key="ok" onClick={handleDownload}>
             {flag ? (
-              /* <a href={'http://192.168.1.28:8651/tos/excel/down?operator_id=' + resultId}>
-                Download
-                </a> */
-              <a href={'http://47.74.233.180:8651/tos/excel/down?operator_id=' + resultId}>
+              <a href={'http://192.168.1.28:8651/tos/excel/down?operator_id=' + resultId}>
                 Download
               </a>
             ) : (
+              // <a href={'http://47.74.233.180:8651/tos/excel/down?operator_id=' + resultId}>
+              //   Download
+              // </a>
               'Download'
             )}
           </Button>,

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -95,8 +95,8 @@ const Users = (props: any) => {
   const propsUpload = {
     name: 'file',
     action: () => {
-      return 'http://47.74.233.180:8651/tos/excel/upload?userId=' + id;
-      // return 'http://192.168.1.28:8651/tos/excel/upload?userId=' + id;
+      // return 'http://47.74.233.180:8651/tos/excel/upload?userId=' + id;
+      return 'http://192.168.1.28:8651/tos/excel/upload?userId=' + id;
     },
     beforeUpload: (file: any) => {
       if (permissionArr.indexOf('4') < 0) {
@@ -125,8 +125,8 @@ const Users = (props: any) => {
               'failed count is ' +
               info.file.response.data.count,
           );
-          setFileUploading(false);
         }
+        setFileUploading(false);
       } else if (info.file.status === 'error') {
         message.error(`${info.file.name} file upload failed.`);
         setFileUploading(false);

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -39,6 +39,7 @@ const UsersDetail = (props: any) => {
 
   // const user_status = [[1, "家属"], [2, "租户"]]
   const user_status = [
+    [0, 'Other'],
     [1, 'Family Member'],
     [2, 'Tenant'],
   ];
@@ -361,7 +362,7 @@ const UsersDetail = (props: any) => {
                   <Col span={4}>User Type：</Col>
                   <Col span={4}>
                     {memberData.owner_relationship != null
-                      ? user_status[memberData.owner_relationship - 1][1]
+                      ? user_status[memberData.owner_relationship][1]
                       : null}
                   </Col>
                 </Row>