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

src/models/ServiceProvider.ts

@@ -64,8 +64,8 @@ export default {
         yield put({ type: "returnCurData", CurData });
         // message.error("Service scope selection error!!!")
         Modal.error({
-          title: 'Service scope selection error',
-          content: 'Accounting service / security  service provider is a single option!!!',
+          title: 'Service selection error',
+          content: 'No multiple selection are not allowed once Accounting or Security server is being selected!',
         });
         return;
       }
@@ -75,8 +75,8 @@ export default {
         let CurData: Boolean = false;
         yield put({ type: "returnCurData", CurData });
         Modal.error({
-          title: 'Community selection error',
-          content: 'You cannot select a community that already has a scope of service!!!',
+          title: 'Service selection error',
+          content: 'The community selected has been assigned to other Accounting or Security service provider. Please select again!',
         });
         return;
       }

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=' + getCookie('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 (file.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {

src/pages/UserManagement/ServiceProviderManagement/Edit.tsx

@@ -48,11 +48,6 @@ const Edit = (props: any) => {
 
       optionsList = [...DataServices.data.rows];
     }
-
-
-    return () => {
-
-    }
   }, [DataServices]);
 
   // 判断是否有小区列表数据返回
@@ -72,14 +67,30 @@ const Edit = (props: any) => {
 
   useEffect(() => {
     if (SaveChooseData != null) {
+      console.log(optionsList);
+      console.log(SaveChooseData);
+      if (SaveChooseData.serviceScopeList.length <= 1) {
         // 处理服务范围数据
         optionsList.forEach((v) => {
           if (v.serviceName === SaveChooseData.serviceScope) {
             SaveChooseData.serviceScopeList = v.serviceCode;
-          formRef.current.setFieldsValue(SaveChooseData);
           }
         });
+      } else {
+        console.log(1122);
+        // 处理服务范围数据
+        optionsList.forEach((v1) => {
+          SaveChooseData.serviceScopeList.forEach((v2: string, index: number) => {
+            console.log(v1.serviceName);
+            console.log(v1.serviceName === v2);
+            if (v1.serviceName === v2) {
+              SaveChooseData.serviceScopeList[index] = v1.serviceCode;
+            }
+          });
+        });
+      }
 
+      formRef.current.setFieldsValue(SaveChooseData);
       console.log(SaveChooseData);
     }
   }, [SaveChooseData]);
@@ -239,7 +250,7 @@ function mapStateToProps(state: any) {
   const { CurData, SaveChooseData } = state.ServiceProvider;
   const { DataServices } = state.User;
   const { CommunityList } = state.Init;
-  console.log(CurData)
+  console.log(CurData);
   return {
     CurData,
     SaveChooseData,

src/pages/user/login/index.tsx

@@ -101,6 +101,8 @@ const Login: React.FC<LoginProps> = (props) => {
     console.log(result);
     if (result.error_code === '0000') {
       message.success('Has Been Sent!');
+    } else {
+      message.error(result.error_msg);
     }
   }, []);