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

src/locales/en-US/menu.ts

@@ -57,7 +57,7 @@ export default {
   'menu.propertymanagement': 'Property Fee Management',
   'menu.commercialservice': 'Commercial Service',
   'menu.commercialservice.communitymaintenance': 'Community maintenance',
-  'menu.commercialservice.ownercomplaints': 'Owner Complaints',
+  'menu.commercialservice.ownercomplaints': 'Complaints',
   'menu.commercialservice.problemfeedback': 'Problem Feedback',
   'menu.commercialservice.renovationapplication': 'Renovation Application',
   'menu.commercialservice.accessCardapplication': 'AccessCard Application',

src/models/CommunityManagement/User.ts

@@ -196,11 +196,11 @@ export default {
       }
     },
 
-    *IA({}, { put }: any) {
+    *IA({ }, { put }: any) {
       var Data3 = null;
       yield put({ type: 'returnPage3', Data3 });
     },
-    *IA2({}, { put }: any) {
+    *IA2({ }, { put }: any) {
       var Data3Error = null;
       yield put({ type: 'returnData3Error', Data3Error });
     },
@@ -220,7 +220,7 @@ export default {
       yield put({ type: 'returnCurString', curString });
     },
 
-    *ResultClear({}, { put }: any) {
+    *ResultClear({ }, { put }: any) {
       var tmp = null;
       yield put({ type: 'returnResult', tmp });
     },
@@ -230,24 +230,29 @@ export default {
       yield put({ type: 'PageDate', pageDate });
     },
 
-    *DataClear({}, { put }: any) {
+    *DataClear({ }, { put }: any) {
       var pageDate = null;
       yield put({ type: 'returnPage', pageDate });
     },
 
-    *MemberResultClear({}, { put }: any) {
+    *MemberResultClear({ }, { put }: any) {
       let memberResult = null;
       yield put({ type: 'returnMemberResult', memberResult });
     },
 
-    *Data4ErrorClear({}, { put }: any) {
+    *Data4ErrorClear({ }, { put }: any) {
       let Data4Error = null;
       yield put({ type: 'returnData4Error', Data4Error });
     },
 
-    *ClearResult({}, { put }: any) {
+    *ClearResult({ }, { put }: any) {
       let Result = null;
       yield put({ type: 'returnResult', Result });
     },
+
+    *ClearReturnValue({ }, { put }: any) {
+      let returnValue = null;
+      yield put({ type: "ReturnValue", returnValue })
+    }
   },
 };

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -92,7 +92,8 @@ const Users = (props: any) => {
   const propsUpload = {
     name: 'file',
     action: () => {
-      return 'http://47.74.233.180:8651/tos/excel/upload?userId=' + getCookie('id');
+      // return 'http://47.74.233.180:8651/tos/excel/upload?userId=' + getCookie('id');
+      return 'http://192.168.1.28:8651/tos/excel/upload?userId=' + getCookie('id');
     },
     beforeUpload: (file: any) => {
       if (file.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -91,14 +91,21 @@ const UsersDetail = (props: any) => {
     if (returnValue != null) {
       if (returnValue.error_code !== '0001') {
         message.success('Delete Successfully!', 3);
-        RA(13, {
-          id: DataSave.id,
-          owerName: DataSave.owerName,
-          enable: DataSave.enable,
-          buildingNumber: DataSave.buildingNumber,
-          floorNumber: DataSave.floorNumber,
-          roomNumber: DataSave.roomNumber,
+        // RA(13, {
+        //   id: DataSave.id,
+        //   owerName: DataSave.owerName,
+        //   enable: DataSave.enable,
+        //   buildingNumber: DataSave.buildingNumber,
+        //   floorNumber: DataSave.floorNumber,
+        //   roomNumber: DataSave.roomNumber,
+        // });
+
+        dispatch({
+          type: 'User/ClearReturnValue',
+          playload: {},
         });
+
+        history.back();
       } else {
         message.error(returnValue.error_msg, 3);
       }