Commit @c09cd0d4bb6fa64b6b7c2f13f36d629c694da01b

박정하 2023-07-11

230711 박정하 대상자 관리 수정

@c09cd0d4bb6fa64b6b7c2f13f36d629c694da01b

bbbc4e9

c09cd0d

client/views/pages/senior_management/SeniorEdit.jsx

--- client/views/pages/senior_management/SeniorEdit.jsx

+++ client/views/pages/senior_management/SeniorEdit.jsx


             <tr>
               <th><span style={{ color: "red" }}>*</span>관리기관</th>
               <td>
-                <select onChange={(e) => { seniorGovernmentIdChange(e.target.value) }}
+                <select disabled onChange={(e) => { seniorGovernmentIdChange(e.target.value) }}
                   ref={el => seniorRef.current['government_id'] = el}>
                   <option value={''} selected={senior['government_id'] == null}>관리기관선택</option>
                   {orgListOfHierarchy.map((item, idx) => {

               </td>
               <th><span style={{ color: "red" }}>*</span>시행기관</th>
               <td>
-                <select onChange={(e) => { seniorAgencyIdChange(e.target.value) }}
+                <select disabled onChange={(e) => { seniorAgencyIdChange(e.target.value) }}
                   ref={el => seniorRef.current['agency_id'] = el}>
                   <option value={''} selected={senior['agency_id'] == null}>시행기관선택</option>
                   {getAgencyList().map((item, idx) => {

bbbc4e9

c09cd0d

client/views/pages/senior_management/SeniorSelectOne.jsx

--- client/views/pages/senior_management/SeniorSelectOne.jsx

+++ client/views/pages/senior_management/SeniorSelectOne.jsx


     });
   };
 
+  const [isRental, setIsRental] = React.useState("false");
+
   //대상자 장비 목록
   const [equipmentBySenior, setEquipmentBySenior] = React.useState([]);
   //대상자 장비 목록 조회

     }).then((response) => response.json()).then((data) => {
       console.log('equipmentRentalList response : ', data);
       setEquipmentBySenior(data);
+
+      let count = 0;
+      data.map((item, idx) => {
+        console.log("item: ", item)
+        if (CommonUtil.isEmpty(item['rental_start_date']) == false && CommonUtil.isEmpty(item['rental_end_date'])) {
+          count++;
+        }
+      })
+      console.log("count: ", count)
+      if (count > 0) {
+        setIsRental(true);
+      } else {
+        setIsRental(false);
+      }
+      console.log("isRental", isRental);
     }).catch((error) => {
       console.log('equipmentRentalList error : ', error);
     });

     }).then((response) => response.json()).then((data) => {
       console.log('deliveryEquipmentSelectList response : ', data);
       setDeliveryEquipment(data);
-      rentalCheck();
     }).catch((error) => {
       console.log('deliveryEquipmentSelectList error : ', error);
     });

       });
     } else {
       return;
-    }
-  }
-
-  const [isRental, setIsRental] = React.useState("false");
-  const rentalCheck = () => {
-    let count = 0;
-
-    equipmentBySenior.map((item, idx) => {
-      if (CommonUtil.isEmpty(item['rental_start_date']) == false && CommonUtil.isEmpty(item['rental_end_date']) == true) {
-        count++;
-      } else {
-        return
-      }
-    })
-
-    if (count > 0) {
-      setIsRental(true);
-    } else {
-      setIsRental(false);
     }
   }
 

bbbc4e9

c09cd0d

client/views/pages/user_management/AgentSelectOne.jsx

--- client/views/pages/user_management/AgentSelectOne.jsx

+++ client/views/pages/user_management/AgentSelectOne.jsx


           </div>
         </div>
 
-        <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" />
-        <button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button>
-        <div className="margin-bottom5">
-          <table className={"agent-user"}>
-            <thead>
-              <tr>
-                <th>No</th>
-                {/* <th>관리기관명</th>
+        {agent['authority'] == 'ROLE_AGENCYADMIN' ? (
+          <>
+            <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" />
+            <button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button>
+            <div className="margin-bottom5">
+              <table className={"agent-user"}>
+                <thead>
+                  <tr>
+                    <th>No</th>
+                    {/* <th>관리기관명</th>
                 <th>소속기관명</th> */}
-                <th>이름</th>
-                <th>연락처</th>
-                <th>생년월일</th>
-                <th>성별</th>
-                <th>상태</th>
-                <th>배정시작일</th>
-                <th>배정종료일</th>
-                <th>상세보기</th>
-              </tr>
-            </thead>
-            <tbody>
-              {seniorByAgent.seniorListByAgent.map((item, idx) => {
-                return (
-                  <tr key={idx}>
-                    <td>{idx + 1}</td>
-                    {/* <td>{item['government_name']}</td>
-                  <td>{item['agency_name']}</td> */}
-                    <td>{item['user_name']}</td>
-                    <td>{item['user_phonenumber']}</td>
-                    <td>{item['user_birth']}</td>
-                    <td>{item['user_gender']}</td>
-                    <td>{item['agent_match_state'] ? <span className="green">케어중</span> : <span className="grey">케어완료</span>}</td>
-                    <td>{item['agent_match_start_date']}</td>
-                    <td>
-                      {item['agent_match_state'] ?
-                        <button className={"btn-small red-btn"} onClick={() => { agentSeniorDelete(item) }}>케어종료</button>
-                        : item['agent_match_end_date']
-                      }
-                    </td>
-                    <td>
-                      <button className={"btn-small lightgray-btn"} onClick={() => { navigate("/SeniorSelectOne", { state: { 'senior_id': item['user_id'] } }) }}>상세 페이지 이동</button>
-                    </td>
+                    <th>이름</th>
+                    <th>연락처</th>
+                    <th>생년월일</th>
+                    <th>성별</th>
+                    <th>상태</th>
+                    <th>배정시작일</th>
+                    <th>배정종료일</th>
+                    <th>상세보기</th>
                   </tr>
-                )
-              })}
-              {seniorByAgent.seniorListByAgent == null || seniorByAgent.seniorListByAgent.length == 0 ?
-                <tr>
-                  <td colSpan={9}>조회된 데이터가 없습니다</td>
-                </tr>
-                : null}
-            </tbody>
-          </table>
-        </div>
+                </thead>
+                <tbody>
+                  {seniorByAgent.seniorListByAgent.map((item, idx) => {
+                    return (
+                      <tr key={idx}>
+                        <td>{idx + 1}</td>
+                        {/* <td>{item['government_name']}</td>
+                  <td>{item['agency_name']}</td> */}
+                        <td>{item['user_name']}</td>
+                        <td>{item['user_phonenumber']}</td>
+                        <td>{item['user_birth']}</td>
+                        <td>{item['user_gender']}</td>
+                        <td>{item['agent_match_state'] ? <span className="green">케어중</span> : <span className="grey">케어완료</span>}</td>
+                        <td>{item['agent_match_start_date']}</td>
+                        <td>
+                          {item['agent_match_state'] ?
+                            <button className={"btn-small red-btn"} onClick={() => { agentSeniorDelete(item) }}>케어종료</button>
+                            : item['agent_match_end_date']
+                          }
+                        </td>
+                        <td>
+                          <button className={"btn-small lightgray-btn"} onClick={() => { navigate("/SeniorSelectOne", { state: { 'senior_id': item['user_id'] } }) }}>상세 페이지 이동</button>
+                        </td>
+                      </tr>
+                    )
+                  })}
+                  {seniorByAgent.seniorListByAgent == null || seniorByAgent.seniorListByAgent.length == 0 ?
+                    <tr>
+                      <td colSpan={9}>조회된 데이터가 없습니다</td>
+                    </tr>
+                    : null}
+                </tbody>
+              </table>
+            </div>
+          </>
+        ) : null
+        }
 
         <div className="btn-wrap flex-center">
           <button className={"btn-large gray-btn"} onClick={() => navigate(-1)}>이전</button>

bbbc4e9

c09cd0d

client/views/pages/user_management/UserEdit.jsx

--- client/views/pages/user_management/UserEdit.jsx

+++ client/views/pages/user_management/UserEdit.jsx


 
   /**** 기본 조회 데이터 (시작) ****/
   //전역 변수 저장 객체
-  const state = useSelector((state) => {return state});
+  const state = useSelector((state) => { return state });
   const defaultGovernmentId = CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'];
 
   //권한 타입 종류

       headers: {
         'Content-Type': 'application/json; charset=UTF-8'
       },
-      body: JSON.stringify({'government_id': defaultGovernmentId}),
+      body: JSON.stringify({ 'government_id': defaultGovernmentId }),
     }).then((response) => response.json()).then((data) => {
       console.log("기관(관리, 시행) 계층 구조 목록 조회 : ", data);
       setOrgListOfHierarchy(data);

       alert("아이디를 입력해 주세요.");
       return;
     }
-    
+
     fetch("/user/userSelectOne.json", {
       method: "POST",
       headers: {

   }
 
 
-   //사용자 등록 유효성 검사
-   const userUpdateValidation = () => {
+  //사용자 등록 유효성 검사
+  const userUpdateValidation = () => {
     if ((user['authority'] == 'ROLE_GOVERNMENT' || user['authority'] == 'ROLE_AGENCY')
-        && CommonUtil.isEmpty(user['government_id']) == true) {
+      && CommonUtil.isEmpty(user['government_id']) == true) {
       userRef.current['government_id'].focus();
       alert("관리기관을 선택해 주세요.");
       return false;

       return false;
     }
     if (CommonUtil.isEmpty(user['user_password']) == false
-        && user['user_password'] != user['user_password_check']) {
+      && user['user_password'] != user['user_password_check']) {
       userRef.current['user_password_check'].focus();
       alert("비밀번호가 일치하지 않습니다.");
       return false;

       console.log('userUpdate() /user/userUpdate.json error : ', error);
     });
   }
-  
+
   //Mounted
   React.useEffect(() => {
     authoritiesSelect();
     orgSelectListOfHierarchy();
     userSelectOne();
   }, []);
-  
+
 
   return (
-      <div className="container row flex-center join-login">
-        <div className="join-group">
-          <h3>계정수정</h3>
-          <div className="join-inner">
+    <div className="container row flex-center join-login">
+      <div className="join-group">
+        <h3>계정수정</h3>
+        <div className="join-inner">
+          <div>
+            <div className="flex-start margin-bottom2">
+              <label className="flex25"><span style={{ color: "red" }}>*</span>사용자구분</label>
+              {authorities[user['authority']]}
+            </div>
+          </div>
+
+          {user['authority'] == 'ROLE_GOVERNMENT' || user['authority'] == 'ROLE_AGENCY' ?
             <div>
               <div className="flex-start margin-bottom2">
-                <label className="flex25"><span style={{color : "red"}}>*</span>사용자구분</label>
-                {authorities[user['authority']]}
-              </div>
-            </div>
-
-            {user['authority'] == 'ROLE_GOVERNMENT' || user['authority'] == 'ROLE_AGENCY' ?
-              <div>
-                <div className="flex-start margin-bottom2">
-                  <label className="flex25" htmlFor="name"><span style={{color : "red"}}>*</span>관리기관</label>
-                  <select onChange={(e) => {userGovernmentIdChange(e.target.value)}} ref={el => userRef.current['government_id'] = el}>
-                    <option value={''} selected={user['government_id'] == null}>관리기관선택</option>
-                    {orgListOfHierarchy.map((item, idx) => { return (
+                <label className="flex25" htmlFor="name"><span style={{ color: "red" }}>*</span>관리기관</label>
+                <select disabled onChange={(e) => { userGovernmentIdChange(e.target.value) }} ref={el => userRef.current['government_id'] = el}>
+                  <option value={''} selected={user['government_id'] == null}>관리기관선택</option>
+                  {orgListOfHierarchy.map((item, idx) => {
+                    return (
                       <option key={idx} value={item['government_id']} selected={user['government_id'] == item['government_id']}>
                         {item['government_name']}
                       </option>
-                    )})}
-                  </select>
-                </div>
+                    )
+                  })}
+                </select>
               </div>
+            </div>
             : null}
 
-            {user['authority'] == 'ROLE_AGENCY' ?
-              <div>
-                <div className="flex-start margin-bottom2">
-                  <label className="flex25" htmlFor="name"><span style={{color : "red"}}>*</span>시행기관</label>
-                  <select onChange={(e) => {userAgencyIdChange(e.target.value)}} ref={el => userRef.current['agency_id'] = el}>
-                    <option value={''} selected={user['agency_id'] == null}>시행기관선택</option>
-                    {getAgencyList().map((item, idx) => { return (
+          {user['authority'] == 'ROLE_AGENCY' ?
+            <div>
+              <div className="flex-start margin-bottom2">
+                <label className="flex25" htmlFor="name"><span style={{ color: "red" }}>*</span>시행기관</label>
+                <select disabled onChange={(e) => { userAgencyIdChange(e.target.value) }} ref={el => userRef.current['agency_id'] = el}>
+                  <option value={''} selected={user['agency_id'] == null}>시행기관선택</option>
+                  {getAgencyList().map((item, idx) => {
+                    return (
                       <option key={idx} value={item['agency_id']} selected={user['agency_id'] == item['agency_id']}>
                         {item['agency_name']}
                       </option>
-                    )})}
-                  </select>
-                </div>
+                    )
+                  })}
+                </select>
               </div>
+            </div>
             : null}
 
-            <div>
-              <div className="flex-start margin-bottom2">
-                <label className="flex25" htmlFor="name"><span style={{color : "red"}}>*</span>이름</label>
-                <input type="text"
-                  value={user['user_name']}
-                  onChange={(e) => {userValueChange('user_name', e.target.value)}}
-                  ref={el => userRef.current['user_name'] = el}
-                />
-              </div>
+          <div>
+            <div className="flex-start margin-bottom2">
+              <label className="flex25" htmlFor="name"><span style={{ color: "red" }}>*</span>이름</label>
+              <input type="text"
+                value={user['user_name']}
+                onChange={(e) => { userValueChange('user_name', e.target.value) }}
+                ref={el => userRef.current['user_name'] = el}
+              />
             </div>
-
-            <div className="id">
-              <div className="flex-start margin-bottom2">
-                <label className="flex25" htmlFor="id"><span style={{color : "red"}}>*</span>아이디</label>
-                <input type="text"
-                  value={user['user_id']}
-                  onChange={(e) => {userValueChange('user_id', e.target.value); setIsIdCheck(false)}}
-                  ref={el => userRef.current['user_id'] = el}
-                />
-                <button className={"red-btn btn-large"} onClick={userIdCheck}
-                  ref={el => userRef.current['user_id_check_button'] = el}>
-                  중복확인
-                </button>
-              </div>
-            </div>
-
-            <div>
-              <div className="flex-start margin-bottom2">
-                <label className="flex25" htmlFor="password"><span style={{color : "red"}}>*</span>비밀번호</label>
-                <input type="password"
-                  value={user['user_password']}
-                  onChange={(e) => {userValueChange('user_password', e.target.value)}}
-                  ref={el => userRef.current['user_password'] = el}
-                />
-              </div>
-            </div>
-            <div>
-              <div className="flex-start margin-bottom2">
-                <label className="flex25" htmlFor="password_check"><span style={{color : "red"}}>*</span>비밀번호 확인</label>
-                <input type="password"
-                  value={user['user_password_check']}
-                  onChange={(e) => {userValueChange('user_password_check', e.target.value)}}
-                  ref={el => userRef.current['user_password_check'] = el}
-                />
-              </div>
-            </div>
-
-            <div>
-              <div className="flex margin-bottom2">
-                <label className="flex25" htmlFor="phone_number"><span style={{color : "red"}}>*</span>전화번호</label>
-                <input type="number" maxLength="11"
-                  value={user['user_phonenumber']}
-                  onChange={(e) => {userValueChange('user_phonenumber', e.target.value)}}
-                  ref={el => userRef.current['user_phonenumber'] = el}
-                />
-              </div>
-            </div>
-
-            <div>
-              <div className="flex-start margin-bottom2">
-                <label className="flex25" htmlFor="password_check">이메일</label>
-                <input type="text"
-                  value={user['user_email']}
-                  onChange={(e) => {userValueChange('user_email', e.target.value)}}
-                  ref={el => userRef.current['user_email'] = el}
-                />
-              </div>
-            </div>
-
-            <div className="btn-wrap">
-              <button className={"gray-btn btn-large"} onClick={() => {navigate(-1)}}>취소</button>
-              <button className={"red-btn btn-large"} onClick={userUpdate}>수정</button>
-            </div>
-
           </div>
+
+          <div className="id">
+            <div className="flex-start margin-bottom2">
+              <label className="flex25" htmlFor="id"><span style={{ color: "red" }}>*</span>아이디</label>
+              <input type="text"
+                value={user['user_id']}
+                onChange={(e) => { userValueChange('user_id', e.target.value); setIsIdCheck(false) }}
+                ref={el => userRef.current['user_id'] = el}
+              />
+              <button className={"red-btn btn-large"} onClick={userIdCheck}
+                ref={el => userRef.current['user_id_check_button'] = el}>
+                중복확인
+              </button>
+            </div>
+          </div>
+
+          <div>
+            <div className="flex-start margin-bottom2">
+              <label className="flex25" htmlFor="password"><span style={{ color: "red" }}>*</span>비밀번호</label>
+              <input type="password"
+                value={user['user_password']}
+                onChange={(e) => { userValueChange('user_password', e.target.value) }}
+                ref={el => userRef.current['user_password'] = el}
+              />
+            </div>
+          </div>
+          <div>
+            <div className="flex-start margin-bottom2">
+              <label className="flex25" htmlFor="password_check"><span style={{ color: "red" }}>*</span>비밀번호 확인</label>
+              <input type="password"
+                value={user['user_password_check']}
+                onChange={(e) => { userValueChange('user_password_check', e.target.value) }}
+                ref={el => userRef.current['user_password_check'] = el}
+              />
+            </div>
+          </div>
+
+          <div>
+            <div className="flex margin-bottom2">
+              <label className="flex25" htmlFor="phone_number"><span style={{ color: "red" }}>*</span>전화번호</label>
+              <input type="number" maxLength="11"
+                value={user['user_phonenumber']}
+                onChange={(e) => { userValueChange('user_phonenumber', e.target.value) }}
+                ref={el => userRef.current['user_phonenumber'] = el}
+              />
+            </div>
+          </div>
+
+          <div>
+            <div className="flex-start margin-bottom2">
+              <label className="flex25" htmlFor="password_check">이메일</label>
+              <input type="text"
+                value={user['user_email']}
+                onChange={(e) => { userValueChange('user_email', e.target.value) }}
+                ref={el => userRef.current['user_email'] = el}
+              />
+            </div>
+          </div>
+
+          <div className="btn-wrap">
+            <button className={"gray-btn btn-large"} onClick={() => { navigate(-1) }}>취소</button>
+            <button className={"red-btn btn-large"} onClick={userUpdate}>수정</button>
+          </div>
+
         </div>
       </div>
+    </div>
   );
 }

Add a comment

Open 0
Closed 0

List

...	...	@@ -318,7 +318,7 @@
318	318	<tr>
319	319	<th><span style={{ color: "red" }}>*</span>관리기관</th>
320	320	<td>
321		- <select onChange={(e) => { seniorGovernmentIdChange(e.target.value) }}
	321	+ <select disabled onChange={(e) => { seniorGovernmentIdChange(e.target.value) }}
322	322	ref={el => seniorRef.current['government_id'] = el}>
323	323	<option value={''} selected={senior['government_id'] == null}>관리기관선택</option>
324	324	{orgListOfHierarchy.map((item, idx) => {
...	...	@@ -332,7 +332,7 @@
332	332	</td>
333	333	<th><span style={{ color: "red" }}>*</span>시행기관</th>
334	334	<td>
335		- <select onChange={(e) => { seniorAgencyIdChange(e.target.value) }}
	335	+ <select disabled onChange={(e) => { seniorAgencyIdChange(e.target.value) }}
336	336	ref={el => seniorRef.current['agency_id'] = el}>
337	337	<option value={''} selected={senior['agency_id'] == null}>시행기관선택</option>
338	338	{getAgencyList().map((item, idx) => {

...	...	@@ -135,6 +135,8 @@
135	135	});
136	136	};
137	137
	138	+ const [isRental, setIsRental] = React.useState("false");
	139	+
138	140	//대상자 장비 목록
139	141	const [equipmentBySenior, setEquipmentBySenior] = React.useState([]);
140	142	//대상자 장비 목록 조회
...	...	@@ -148,6 +150,21 @@
148	150	}).then((response) => response.json()).then((data) => {
149	151	console.log('equipmentRentalList response : ', data);
150	152	setEquipmentBySenior(data);
	153	+
	154	+ let count = 0;
	155	+ data.map((item, idx) => {
	156	+ console.log("item: ", item)
	157	+ if (CommonUtil.isEmpty(item['rental_start_date']) == false && CommonUtil.isEmpty(item['rental_end_date'])) {
	158	+ count++;
	159	+ }
	160	+ })
	161	+ console.log("count: ", count)
	162	+ if (count > 0) {
	163	+ setIsRental(true);
	164	+ } else {
	165	+ setIsRental(false);
	166	+ }
	167	+ console.log("isRental", isRental);
151	168	}).catch((error) => {
152	169	console.log('equipmentRentalList error : ', error);
153	170	});
...	...	@@ -202,7 +219,6 @@
202	219	}).then((response) => response.json()).then((data) => {
203	220	console.log('deliveryEquipmentSelectList response : ', data);
204	221	setDeliveryEquipment(data);
205		- rentalCheck();
206	222	}).catch((error) => {
207	223	console.log('deliveryEquipmentSelectList error : ', error);
208	224	});
...	...	@@ -435,25 +451,6 @@
435	451	});
436	452	} else {
437	453	return;
438		- }
439		- }
440		-
441		- const [isRental, setIsRental] = React.useState("false");
442		- const rentalCheck = () => {
443		- let count = 0;
444		-
445		- equipmentBySenior.map((item, idx) => {
446		- if (CommonUtil.isEmpty(item['rental_start_date']) == false && CommonUtil.isEmpty(item['rental_end_date']) == true) {
447		- count++;
448		- } else {
449		- return
450		- }
451		- })
452		-
453		- if (count > 0) {
454		- setIsRental(true);
455		- } else {
456		- setIsRental(false);
457	454	}
458	455	}
459	456

...	...	@@ -203,58 +203,63 @@
203	203	</div>
204	204	</div>
205	205
206		- <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" />
207		- <button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button>
208		- <div className="margin-bottom5">
209		- <table className={"agent-user"}>
210		- <thead>
211		- <tr>
212		- <th>No</th>
213		- {/* <th>관리기관명</th>
	206	+ {agent['authority'] == 'ROLE_AGENCYADMIN' ? (
	207	+ <>
	208	+ <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" />
	209	+ <button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button>
	210	+ <div className="margin-bottom5">
	211	+ <table className={"agent-user"}>
	212	+ <thead>
	213	+ <tr>
	214	+ <th>No</th>
	215	+ {/* <th>관리기관명</th>
214	216	<th>소속기관명</th> */}
215		- <th>이름</th>
216		- <th>연락처</th>
217		- <th>생년월일</th>
218		- <th>성별</th>
219		- <th>상태</th>
220		- <th>배정시작일</th>
221		- <th>배정종료일</th>
222		- <th>상세보기</th>
223		- </tr>
224		- </thead>
225		- <tbody>
226		- {seniorByAgent.seniorListByAgent.map((item, idx) => {
227		- return (
228		- <tr key={idx}>
229		- <td>{idx + 1}</td>
230		- {/* <td>{item['government_name']}</td>
231		- <td>{item['agency_name']}</td> */}
232		- <td>{item['user_name']}</td>
233		- <td>{item['user_phonenumber']}</td>
234		- <td>{item['user_birth']}</td>
235		- <td>{item['user_gender']}</td>
236		- <td>{item['agent_match_state'] ? <span className="green">케어중</span> : <span className="grey">케어완료</span>}</td>
237		- <td>{item['agent_match_start_date']}</td>
238		- <td>
239		- {item['agent_match_state'] ?
240		- <button className={"btn-small red-btn"} onClick={() => { agentSeniorDelete(item) }}>케어종료</button>
241		- : item['agent_match_end_date']
242		- }
243		- </td>
244		- <td>
245		- <button className={"btn-small lightgray-btn"} onClick={() => { navigate("/SeniorSelectOne", { state: { 'senior_id': item['user_id'] } }) }}>상세 페이지 이동</button>
246		- </td>
	217	+ <th>이름</th>
	218	+ <th>연락처</th>
	219	+ <th>생년월일</th>
	220	+ <th>성별</th>
	221	+ <th>상태</th>
	222	+ <th>배정시작일</th>
	223	+ <th>배정종료일</th>
	224	+ <th>상세보기</th>
247	225	</tr>
248		- )
249		- })}
250		- {seniorByAgent.seniorListByAgent == null \|\| seniorByAgent.seniorListByAgent.length == 0 ?
251		- <tr>
252		- <td colSpan={9}>조회된 데이터가 없습니다</td>
253		- </tr>
254		- : null}
255		- </tbody>
256		- </table>
257		- </div>
	226	+ </thead>
	227	+ <tbody>
	228	+ {seniorByAgent.seniorListByAgent.map((item, idx) => {
	229	+ return (
	230	+ <tr key={idx}>
	231	+ <td>{idx + 1}</td>
	232	+ {/* <td>{item['government_name']}</td>
	233	+ <td>{item['agency_name']}</td> */}
	234	+ <td>{item['user_name']}</td>
	235	+ <td>{item['user_phonenumber']}</td>
	236	+ <td>{item['user_birth']}</td>
	237	+ <td>{item['user_gender']}</td>
	238	+ <td>{item['agent_match_state'] ? <span className="green">케어중</span> : <span className="grey">케어완료</span>}</td>
	239	+ <td>{item['agent_match_start_date']}</td>
	240	+ <td>
	241	+ {item['agent_match_state'] ?
	242	+ <button className={"btn-small red-btn"} onClick={() => { agentSeniorDelete(item) }}>케어종료</button>
	243	+ : item['agent_match_end_date']
	244	+ }
	245	+ </td>
	246	+ <td>
	247	+ <button className={"btn-small lightgray-btn"} onClick={() => { navigate("/SeniorSelectOne", { state: { 'senior_id': item['user_id'] } }) }}>상세 페이지 이동</button>
	248	+ </td>
	249	+ </tr>
	250	+ )
	251	+ })}
	252	+ {seniorByAgent.seniorListByAgent == null \|\| seniorByAgent.seniorListByAgent.length == 0 ?
	253	+ <tr>
	254	+ <td colSpan={9}>조회된 데이터가 없습니다</td>
	255	+ </tr>
	256	+ : null}
	257	+ </tbody>
	258	+ </table>
	259	+ </div>
	260	+ </>
	261	+ ) : null
	262	+ }
258	263
259	264	<div className="btn-wrap flex-center">
260	265	<button className={"btn-large gray-btn"} onClick={() => navigate(-1)}>이전</button>

...	...	@@ -10,7 +10,7 @@
10	10
11	11	/** 기본 조회 데이터 (시작) **/
12	12	//전역 변수 저장 객체
13		- const state = useSelector((state) => {return state});
	13	+ const state = useSelector((state) => { return state });
14	14	const defaultGovernmentId = CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'];
15	15
16	16	//권한 타입 종류
...	...	@@ -39,7 +39,7 @@
39	39	headers: {
40	40	'Content-Type': 'application/json; charset=UTF-8'
41	41	},
42		- body: JSON.stringify({'government_id': defaultGovernmentId}),
	42	+ body: JSON.stringify({ 'government_id': defaultGovernmentId }),
43	43	}).then((response) => response.json()).then((data) => {
44	44	console.log("기관(관리, 시행) 계층 구조 목록 조회 : ", data);
45	45	setOrgListOfHierarchy(data);
...	...	@@ -131,7 +131,7 @@
131	131	alert("아이디를 입력해 주세요.");
132	132	return;
133	133	}
134		-
	134	+
135	135	fetch("/user/userSelectOne.json", {
136	136	method: "POST",
137	137	headers: {
...	...	@@ -155,10 +155,10 @@
155	155	}
156	156
157	157
158		- //사용자 등록 유효성 검사
159		- const userUpdateValidation = () => {
	158	+ //사용자 등록 유효성 검사
	159	+ const userUpdateValidation = () => {
160	160	if ((user['authority'] == 'ROLE_GOVERNMENT' \|\| user['authority'] == 'ROLE_AGENCY')
161		- && CommonUtil.isEmpty(user['government_id']) == true) {
	161	+ && CommonUtil.isEmpty(user['government_id']) == true) {
162	162	userRef.current['government_id'].focus();
163	163	alert("관리기관을 선택해 주세요.");
164	164	return false;
...	...	@@ -185,7 +185,7 @@
185	185	return false;
186	186	}
187	187	if (CommonUtil.isEmpty(user['user_password']) == false
188		- && user['user_password'] != user['user_password_check']) {
	188	+ && user['user_password'] != user['user_password_check']) {
189	189	userRef.current['user_password_check'].focus();
190	190	alert("비밀번호가 일치하지 않습니다.");
191	191	return false;
...	...	@@ -229,135 +229,139 @@
229	229	console.log('userUpdate() /user/userUpdate.json error : ', error);
230	230	});
231	231	}
232		-
	232	+
233	233	//Mounted
234	234	React.useEffect(() => {
235	235	authoritiesSelect();
236	236	orgSelectListOfHierarchy();
237	237	userSelectOne();
238	238	}, []);
239		-
	239	+
240	240
241	241	return (
242		- <div className="container row flex-center join-login">
243		- <div className="join-group">
244		- <h3>계정수정</h3>
245		- <div className="join-inner">
	242	+ <div className="container row flex-center join-login">
	243	+ <div className="join-group">
	244	+ <h3>계정수정</h3>
	245	+ <div className="join-inner">
	246	+ <div>
	247	+ <div className="flex-start margin-bottom2">
	248	+ <label className="flex25"><span style={{ color: "red" }}>*</span>사용자구분</label>
	249	+ {authorities[user['authority']]}
	250	+ </div>
	251	+ </div>
	252	+
	253	+ {user['authority'] == 'ROLE_GOVERNMENT' \|\| user['authority'] == 'ROLE_AGENCY' ?
246	254	<div>
247	255	<div className="flex-start margin-bottom2">
248		- <label className="flex25"><span style={{color : "red"}}>*</span>사용자구분</label>
249		- {authorities[user['authority']]}
250		- </div>
251		- </div>
252		-
253		- {user['authority'] == 'ROLE_GOVERNMENT' \|\| user['authority'] == 'ROLE_AGENCY' ?
254		- <div>
255		- <div className="flex-start margin-bottom2">
256		- <label className="flex25" htmlFor="name"><span style={{color : "red"}}>*</span>관리기관</label>
257		- <select onChange={(e) => {userGovernmentIdChange(e.target.value)}} ref={el => userRef.current['government_id'] = el}>
258		- <option value={''} selected={user['government_id'] == null}>관리기관선택</option>
259		- {orgListOfHierarchy.map((item, idx) => { return (
	256	+ <label className="flex25" htmlFor="name"><span style={{ color: "red" }}>*</span>관리기관</label>
	257	+ <select disabled onChange={(e) => { userGovernmentIdChange(e.target.value) }} ref={el => userRef.current['government_id'] = el}>
	258	+ <option value={''} selected={user['government_id'] == null}>관리기관선택</option>
	259	+ {orgListOfHierarchy.map((item, idx) => {
	260	+ return (
260	261	<option key={idx} value={item['government_id']} selected={user['government_id'] == item['government_id']}>
261	262	{item['government_name']}
262	263	</option>
263		- )})}
264		- </select>
265		- </div>
	264	+ )
	265	+ })}
	266	+ </select>
266	267	</div>
	268	+ </div>
267	269	: null}
268	270
269		- {user['authority'] == 'ROLE_AGENCY' ?
270		- <div>
271		- <div className="flex-start margin-bottom2">
272		- <label className="flex25" htmlFor="name"><span style={{color : "red"}}>*</span>시행기관</label>
273		- <select onChange={(e) => {userAgencyIdChange(e.target.value)}} ref={el => userRef.current['agency_id'] = el}>
274		- <option value={''} selected={user['agency_id'] == null}>시행기관선택</option>
275		- {getAgencyList().map((item, idx) => { return (
	271	+ {user['authority'] == 'ROLE_AGENCY' ?
	272	+ <div>
	273	+ <div className="flex-start margin-bottom2">
	274	+ <label className="flex25" htmlFor="name"><span style={{ color: "red" }}>*</span>시행기관</label>
	275	+ <select disabled onChange={(e) => { userAgencyIdChange(e.target.value) }} ref={el => userRef.current['agency_id'] = el}>
	276	+ <option value={''} selected={user['agency_id'] == null}>시행기관선택</option>
	277	+ {getAgencyList().map((item, idx) => {
	278	+ return (
276	279	<option key={idx} value={item['agency_id']} selected={user['agency_id'] == item['agency_id']}>
277	280	{item['agency_name']}
278	281	</option>
279		- )})}
280		- </select>
281		- </div>
	282	+ )
	283	+ })}
	284	+ </select>
282	285	</div>
	286	+ </div>
283	287	: null}
284	288
285		- <div>
286		- <div className="flex-start margin-bottom2">
287		- <label className="flex25" htmlFor="name"><span style={{color : "red"}}>*</span>이름</label>
288		- <input type="text"
289		- value={user['user_name']}
290		- onChange={(e) => {userValueChange('user_name', e.target.value)}}
291		- ref={el => userRef.current['user_name'] = el}
292		- />
293		- </div>
	289	+ <div>
	290	+ <div className="flex-start margin-bottom2">
	291	+ <label className="flex25" htmlFor="name"><span style={{ color: "red" }}>*</span>이름</label>
	292	+ <input type="text"
	293	+ value={user['user_name']}
	294	+ onChange={(e) => { userValueChange('user_name', e.target.value) }}
	295	+ ref={el => userRef.current['user_name'] = el}
	296	+ />
294	297	</div>
295		-
296		- <div className="id">
297		- <div className="flex-start margin-bottom2">
298		- <label className="flex25" htmlFor="id"><span style={{color : "red"}}>*</span>아이디</label>
299		- <input type="text"
300		- value={user['user_id']}
301		- onChange={(e) => {userValueChange('user_id', e.target.value); setIsIdCheck(false)}}
302		- ref={el => userRef.current['user_id'] = el}
303		- />
304		- <button className={"red-btn btn-large"} onClick={userIdCheck}
305		- ref={el => userRef.current['user_id_check_button'] = el}>
306		- 중복확인
307		- </button>
308		- </div>
309		- </div>
310		-
311		- <div>
312		- <div className="flex-start margin-bottom2">
313		- <label className="flex25" htmlFor="password"><span style={{color : "red"}}>*</span>비밀번호</label>
314		- <input type="password"
315		- value={user['user_password']}
316		- onChange={(e) => {userValueChange('user_password', e.target.value)}}
317		- ref={el => userRef.current['user_password'] = el}
318		- />
319		- </div>
320		- </div>
321		- <div>
322		- <div className="flex-start margin-bottom2">
323		- <label className="flex25" htmlFor="password_check"><span style={{color : "red"}}>*</span>비밀번호 확인</label>
324		- <input type="password"
325		- value={user['user_password_check']}
326		- onChange={(e) => {userValueChange('user_password_check', e.target.value)}}
327		- ref={el => userRef.current['user_password_check'] = el}
328		- />
329		- </div>
330		- </div>
331		-
332		- <div>
333		- <div className="flex margin-bottom2">
334		- <label className="flex25" htmlFor="phone_number"><span style={{color : "red"}}>*</span>전화번호</label>
335		- <input type="number" maxLength="11"
336		- value={user['user_phonenumber']}
337		- onChange={(e) => {userValueChange('user_phonenumber', e.target.value)}}
338		- ref={el => userRef.current['user_phonenumber'] = el}
339		- />
340		- </div>
341		- </div>
342		-
343		- <div>
344		- <div className="flex-start margin-bottom2">
345		- <label className="flex25" htmlFor="password_check">이메일</label>
346		- <input type="text"
347		- value={user['user_email']}
348		- onChange={(e) => {userValueChange('user_email', e.target.value)}}
349		- ref={el => userRef.current['user_email'] = el}
350		- />
351		- </div>
352		- </div>
353		-
354		- <div className="btn-wrap">
355		- <button className={"gray-btn btn-large"} onClick={() => {navigate(-1)}}>취소</button>
356		- <button className={"red-btn btn-large"} onClick={userUpdate}>수정</button>
357		- </div>
358		-
359	298	</div>
	299	+
	300	+ <div className="id">
	301	+ <div className="flex-start margin-bottom2">
	302	+ <label className="flex25" htmlFor="id"><span style={{ color: "red" }}>*</span>아이디</label>
	303	+ <input type="text"
	304	+ value={user['user_id']}
	305	+ onChange={(e) => { userValueChange('user_id', e.target.value); setIsIdCheck(false) }}
	306	+ ref={el => userRef.current['user_id'] = el}
	307	+ />
	308	+ <button className={"red-btn btn-large"} onClick={userIdCheck}
	309	+ ref={el => userRef.current['user_id_check_button'] = el}>
	310	+ 중복확인
	311	+ </button>
	312	+ </div>
	313	+ </div>
	314	+
	315	+ <div>
	316	+ <div className="flex-start margin-bottom2">
	317	+ <label className="flex25" htmlFor="password"><span style={{ color: "red" }}>*</span>비밀번호</label>
	318	+ <input type="password"
	319	+ value={user['user_password']}
	320	+ onChange={(e) => { userValueChange('user_password', e.target.value) }}
	321	+ ref={el => userRef.current['user_password'] = el}
	322	+ />
	323	+ </div>
	324	+ </div>
	325	+ <div>
	326	+ <div className="flex-start margin-bottom2">
	327	+ <label className="flex25" htmlFor="password_check"><span style={{ color: "red" }}>*</span>비밀번호 확인</label>
	328	+ <input type="password"
	329	+ value={user['user_password_check']}
	330	+ onChange={(e) => { userValueChange('user_password_check', e.target.value) }}
	331	+ ref={el => userRef.current['user_password_check'] = el}
	332	+ />
	333	+ </div>
	334	+ </div>
	335	+
	336	+ <div>
	337	+ <div className="flex margin-bottom2">
	338	+ <label className="flex25" htmlFor="phone_number"><span style={{ color: "red" }}>*</span>전화번호</label>
	339	+ <input type="number" maxLength="11"
	340	+ value={user['user_phonenumber']}
	341	+ onChange={(e) => { userValueChange('user_phonenumber', e.target.value) }}
	342	+ ref={el => userRef.current['user_phonenumber'] = el}
	343	+ />
	344	+ </div>
	345	+ </div>
	346	+
	347	+ <div>
	348	+ <div className="flex-start margin-bottom2">
	349	+ <label className="flex25" htmlFor="password_check">이메일</label>
	350	+ <input type="text"
	351	+ value={user['user_email']}
	352	+ onChange={(e) => { userValueChange('user_email', e.target.value) }}
	353	+ ref={el => userRef.current['user_email'] = el}
	354	+ />
	355	+ </div>
	356	+ </div>
	357	+
	358	+ <div className="btn-wrap">
	359	+ <button className={"gray-btn btn-large"} onClick={() => { navigate(-1) }}>취소</button>
	360	+ <button className={"red-btn btn-large"} onClick={userUpdate}>수정</button>
	361	+ </div>
	362	+
360	363	</div>
361	364	</div>
	365	+ </div>
362	366	);
363	367	}

Delete comment