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

src/pages/CommercialService/CardDetail.tsx

@@ -117,7 +117,7 @@ const CardDetail = (props: any) => {
                 {onwerDetail.owerName} {onwerDetail.deleted === 1 && '(Canceled)'}{' '}
               </Col>
               <Col>Contact Details:</Col>
-              <Col span={2}>{onwerDetail.owerPhone}</Col>
+              <Col span={3}>{onwerDetail.owerPhone}</Col>
               <Col>{onwerDetail.owerEmail}</Col>
             </Row>
             <Line />
@@ -127,7 +127,7 @@ const CardDetail = (props: any) => {
                 {listData.apply_name} {listData.exist === '1' && '(Canceled)'}
               </Col>
               <Col>Contact Details:</Col>
-              <Col span={2}>{listData.apply_name_phone}</Col>
+              <Col span={3}>{listData.apply_name_phone}</Col>
               <Col>{listData.apply_name_email}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>

src/pages/CommercialService/RenovationDetail.tsx

@@ -116,7 +116,7 @@ const RenovationDetail = (props: any) => {
                 {onwerDetail.owerName} {onwerDetail.deleted === 1 && '(Canceled)'}
               </Col>
               <Col>Contact Details:</Col>
-              <Col span={2}>{onwerDetail.owerPhone}</Col>
+              <Col span={3}>{onwerDetail.owerPhone}</Col>
               <Col>{onwerDetail.owerEmail}</Col>
             </Row>
 
@@ -127,7 +127,7 @@ const RenovationDetail = (props: any) => {
                 {listData.contactName} {listData.exist === '1' && '(Canceled)'}
               </Col>
               <Col>Contact Details:</Col>
-              <Col span={2}>{listData.contactPhone}</Col>
+              <Col span={3}>{listData.contactPhone}</Col>
               <Col>{listData.contactEmail}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>

src/pages/UserManagement/ServiceProviderManagement/Edit.tsx

 import React, { useState, useEffect, useRef } from 'react';
-import { Input, Button, Form, Spin, Modal, Checkbox } from 'antd';
+import { Input, Button, Form, Spin, Checkbox, Modal } from 'antd';
 
 import { connect, history } from 'umi';
 
 import { RA } from '@/utils/method';
-import { CheckboxValueType } from 'antd/lib/checkbox/Group';
+// import { CheckboxValueType } from 'antd/lib/checkbox/Group';
 import SelectOptions from '../../../components/SelectOptions/index';
+import ShowOptions from '@/components/ShowOptions/index';
 import TitleBack from '../../../components/TitleBack/TitleBack';
 import styles from './Edit.less';
+import type { CheckboxValueType } from 'antd/lib/checkbox/Group';
 
 const module = 'User';
 let options: Array<{ label: string; value: number }> = [];
@@ -18,9 +20,7 @@ let optionsList: {
 
 const Edit = (props: any) => {
   const { dispatch, CurData, SaveChooseData, CommunityList, DataServices } = props;
-
   const [CList, setCList] = useState(CommunityList);
-
   const [load, setload] = useState(false);
 
   const TosTosServiceProviderSave = (values: any) => {
@@ -56,7 +56,6 @@ const Edit = (props: any) => {
           value: v.serviceCode,
         };
       });
-
       optionsList = [...DataServices.data.rows];
     }
   }, [DataServices]);
@@ -112,6 +111,7 @@ const Edit = (props: any) => {
     val.updater = 'admin';
     if (SaveChooseData) {
       val.id = SaveChooseData.id;
+      val.serviceScopeList = SaveChooseData.serviceScopeList;
     }
     setload(true);
     TosTosServiceProviderSave(val);
@@ -159,15 +159,22 @@ const Edit = (props: any) => {
 
           <div className={styles.line} />
 
+          {SaveChooseData !== null ? (
+            <ShowOptions list={SaveChooseData.serviceCommunityList} defaultValue="Close" />
+          ) : (
             <SelectOptions
               list={CommunityList ? CommunityList.sort() : []}
-            checklist={SaveChooseData != null ? SaveChooseData.serviceCommunityList : null}
+              // checklist={SaveChooseData != null ? SaveChooseData.serviceCommunityList : null}
               onSubmit={printContent}
             />
+          )}
 
           <div className={styles.box2}>
             <div className={styles.box2item1}>Services Available</div>
             <div className={styles.box2item2}>
+              {SaveChooseData !== null ? (
+                SaveChooseData?.serviceScope
+              ) : (
                 <Form.Item
                   name="serviceScopeList"
                   rules={[
@@ -177,9 +184,9 @@ const Edit = (props: any) => {
                     },
                   ]}
                 >
-                <Checkbox.Group options={options as any} onChange={onSelectCheckBox} />
-                {/* <Radio.Group options={options as any} /> */}
+                  <Checkbox.Group options={options} onChange={onSelectCheckBox} />
                 </Form.Item>
+              )}
             </div>
           </div>