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

src/models/ServiceProvider.ts

@@ -65,7 +65,7 @@ export default {
         // message.error("Service scope selection error!!!")
         Modal.error({
           title: 'Service selection error',
-          content: 'No multiple selection are not allowed once Accounting or Security server is being selected!',
+          content: 'No multiple selection are allowed once Accounting or Security server is being selected!',
         });
         return;
       }
@@ -98,6 +98,14 @@ export default {
         yield put({ type: 'returnCurData', CurData });
         return;
       }
+
+      // 小区选择错误
+      if (resp.error_code === "0004") {
+        let CurData: Boolean = false;
+        yield put({ type: "returnCurData", CurData });
+        message.error("Company name already exists!")
+        return;
+      }
     },
 
     //获取服务商保安根据服务商名

src/pages/CommercialService/Card.tsx

@@ -31,6 +31,7 @@ const Card = (props: any) => {
     [3, 'Received'],
   ];
 
+  // [0,业主],[1,家人],[2,租客]
   const apply_relation = [
     [0, 'Owner'],
     [1, 'Family Member'],

src/pages/UserManagement/ServiceProviderManagement/AccoutingContent.less

@@ -48,15 +48,7 @@
 }
 .box1item2 {
   position: absolute;
-  left: 154px;
-}
-.box1item3 {
-  position: absolute;
-  left: 499px;
-}
-.box1item4 {
-  position: absolute;
-  left: 648px;
+  left: 189px;
 }
 
 .box2 {

src/pages/UserManagement/ServiceProviderManagement/AccoutingContent.tsx

@@ -110,15 +110,15 @@ const AccoutingContent = (props: {
           <div className={styles.box1}>
             <div className={styles.box1item1}>Company Name</div>
             <div className={styles.box1item2}>{SaveChooseData.providerName}</div>
-            <div className={styles.box1item3}>Office Address</div>
-            <div className={styles.box1item4}>{SaveChooseData.providerAddress}</div>
           </div>
-          <Line />
-          <div style={{ marginBottom: 28 }}>Service Community</div>
-          <ShowOptions list={SaveChooseData.serviceCommunityList} />
+          <div className={styles.box2}>
+            <div className={styles.box2item1}>Office Address</div>
+            <div className={styles.box2item2}>{SaveChooseData.providerAddress}</div>
+          </div>
+
           <div className={styles.box2}>
             <div className={styles.box2item1}>Services Available</div>
-            <div className={styles.box2item2}>Accounting</div>
+            <div className={styles.box2item2}>Accounting Service</div>
           </div>
 
           <div className={styles.box2}>
@@ -140,6 +140,9 @@ const AccoutingContent = (props: {
               复制
             </Button>
           </div>
+
+          <div style={{ marginBottom: 28, marginTop: 30 }}>Service Community</div>
+          <ShowOptions list={SaveChooseData.serviceCommunityList} />
         </Spin>
       ) : (
         <></>

src/pages/UserManagement/ServiceProviderManagement/Edit.tsx

@@ -67,22 +67,18 @@ const Edit = (props: any) => {
 
   useEffect(() => {
     if (SaveChooseData != null) {
-      console.log(optionsList);
-      console.log(SaveChooseData);
+      setCList(SaveChooseData.serviceCommunityList);
       if (SaveChooseData.serviceScopeList.length <= 1) {
         // 处理服务范围数据
-        optionsList.forEach((v) => {
+        optionsList.forEach((v, index) => {
           if (v.serviceName === SaveChooseData.serviceScope) {
-            SaveChooseData.serviceScopeList = v.serviceCode;
+            SaveChooseData.serviceScopeList[index] = v.serviceCode;
           }
         });
       } 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;
             }
@@ -105,11 +101,11 @@ const Edit = (props: any) => {
     val.serviceCommunityList = CList;
     val.creator = 'admin';
     val.updater = 'admin';
-    // val.serviceScopeList = val.serviceScopeList;
     if (SaveChooseData) {
       val.id = SaveChooseData.id;
     }
     console.log(val);
+
     setload(true);
     TosTosServiceProviderSave(val);
   };
@@ -250,7 +246,6 @@ function mapStateToProps(state: any) {
   const { CurData, SaveChooseData } = state.ServiceProvider;
   const { DataServices } = state.User;
   const { CommunityList } = state.Init;
-  console.log(CurData);
   return {
     CurData,
     SaveChooseData,