pav
/
pav-fe-kac-pal
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

비행계획관리 컴포넌트 간격 수정

pull/2/head
junh_eee(이준희) 2 years ago
parent
e1b91129fb
commit
510bd6e6ec
6 changed files with 172 additions and 208 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 119
      src/components/basis/flight/aprv/FlightPlanAprvGrid.js
  2. 143
      src/components/basis/flight/aprv/FlightPlanAprvSearch.js
  3. 93
      src/components/basis/flight/plan/FlightPlanGrid.js
  4. 6
      src/components/basis/group/BasisGroupApprovalGrid.js
  5. 1
      src/components/basis/group/BasisGroupApprovalSearch.js
  6. 18
      src/components/basis/group/BasisGroupGrid.js

119
src/components/basis/flight/aprv/FlightPlanAprvGrid.js
Unescape View File

@ -96,70 +96,65 @@ const FlightPlanAprvGrid = ({
];
return (
// <div className='pal-card-box'>
<div className='mt-2'>
<Row>
<Col>
<div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
<h4>비행계획서 신청 목록</h4>
<span className='search-case'>
검색결과 총 {!!data ? data.length : 0}건
</span>
</div>
<div className='d-flex align-items-center'>
<Button.Ripple
color='primary'
size='sm'
onClick={handleClickAprv('aprv')}
{...(aprvAuth ? {} : { disabled: true })}
>
승인
</Button.Ripple>
<Button.Ripple
color='primary'
size='sm'
style={{ marginLeft: 10 }}
onClick={handleClickAprv('notAprov')}
{...(aprvAuth ? {} : { disabled: true })}
>
미승인
</Button.Ripple>
</div>
</div>
<div className='invoice-list-wrapper'>
<Card>
<div className='invoice-list-dataTable'>
{loading ? (
<div className='grid-loading'>
<div>
<Spinner color='primary' />
<span>Loading...</span>
</div>
</div>
) : null}
<GridDatabase
title={'비행이력'}
data={data}
columns={columns}
count={!!data ? data.length : 0}
// pagination={props.pagination}
selectableRows
selectableRowsComponent={selectableRowsComponent}
onSelectedRowsChange={handleChangeSelected}
pagination={pagination}
paginationPerPage={paginationPerPage}
paginationRowsPerPageOptions={paginationRowsPerPageOptions}
handlerPageChange={handlerPageChange}
total={total}
/>
{/* 검색된 데이터가 없습니다. */}
<>
<div className='mt-2 cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
<h4>비행계획서 신청 목록</h4>
<span className='search-case'>
검색결과 총 {!!data ? data.length : 0}건
</span>
</div>
<div className='d-flex align-items-center'>
<Button.Ripple
color='primary'
size='sm'
onClick={handleClickAprv('aprv')}
{...(aprvAuth ? {} : { disabled: true })}
>
승인
</Button.Ripple>
<Button.Ripple
color='primary'
size='sm'
style={{ marginLeft: 10 }}
onClick={handleClickAprv('notAprov')}
{...(aprvAuth ? {} : { disabled: true })}
>
미승인
</Button.Ripple>
</div>
</div>
<div className='invoice-list-wrapper'>
<Card>
<div className='invoice-list-dataTable'>
{loading ? (
<div className='grid-loading'>
<div>
<Spinner color='primary' />
<span>Loading...</span>
</div>
</div>
</Card>
) : null}
<GridDatabase
title={'비행이력'}
data={data}
columns={columns}
count={!!data ? data.length : 0}
// pagination={props.pagination}
selectableRows
selectableRowsComponent={selectableRowsComponent}
onSelectedRowsChange={handleChangeSelected}
pagination={pagination}
paginationPerPage={paginationPerPage}
paginationRowsPerPageOptions={paginationRowsPerPageOptions}
handlerPageChange={handlerPageChange}
total={total}
/>
{/* 검색된 데이터가 없습니다. */}
</div>
</Col>
</Row>
</div>
</Card>
</div>
</>
);
};

143
src/components/basis/flight/aprv/FlightPlanAprvSearch.js
Unescape View File

@ -70,11 +70,10 @@ const FlightPlanAprvSearch = ({
}
};
return (
// <div className='pal-card-box'>
<div>
<Row>
<Col>
<div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div className='mt-2 cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
<h4>검색조건</h4>
</div>
@ -90,81 +89,81 @@ const FlightPlanAprvSearch = ({
</div>
</div>
<Card>
{/* <CardBody className='pal-card-body'> */}
<div className='search-cont'>
<dl>
<dt>
<div className='search-box'>
<div className='search-list-ti'>신청일</div>
<div className='search-list'>
<div className='search-list-cont'>
<Row>
<Col className='list-input' xl='4' md='6' sm='12'>
<div className='d-flex align-items-center calendar-flat'>
<Flatpickr
id='searchDate'
value={[schFltStDt, schFltEndDt]}
options={{
mode: 'range'
// defaultDate: [
// props.params.stDate,
// props.params.endDate
// ]
}}
onChange={handleChangeInput}
className='form-control flat-picker bg-transparent border-0 shadow-none'
/>
</div>
</Col>
</Row>
<CardBody className='pal-card-body'>
<div className='search-cont'>
<dl>
<dt>
<div className='search-box'>
<div className='search-list-ti'>신청일</div>
<div className='search-list'>
<div className='search-list-cont'>
<Row>
<Col className='list-input' xl='4' md='6' sm='12'>
<div className='d-flex align-items-center calendar-flat'>
<Flatpickr
id='searchDate'
value={[schFltStDt, schFltEndDt]}
options={{
mode: 'range'
// defaultDate: [
// props.params.stDate,
// props.params.endDate
// ]
}}
onChange={handleChangeInput}
className='form-control flat-picker bg-transparent border-0 shadow-none'
/>
</div>
</Col>
</Row>
</div>
</div>
</div>
</div>
</dt>
</dt>
<dt>
<div className='search-box'>
<div className='search-list-ti'>승인여부</div>
<div className='search-list'>
<div className='search-list-cont'>
<CustomInput
inline
type='checkbox'
id='exampleCustomCheckbox'
label='전체'
name='aprvlYn'
value='A'
// checked={true}
checked={checkState.all}
onChange={handleChangeCheckbox}
/>
<CustomInput
inline
type='checkbox'
id='exampleCustomCheckbox2'
label='승인'
name='aprvlYn'
value='Y'
checked={checkState.yes}
onChange={handleChangeCheckbox}
/>
<CustomInput
inline
type='checkbox'
id='exampleCustomCheckbox3'
label='미승인'
name='aprvlYn'
value='N'
checked={checkState.no}
onChange={handleChangeCheckbox}
/>
<dt>
<div className='search-box'>
<div className='search-list-ti'>승인여부</div>
<div className='search-list'>
<div className='search-list-cont'>
<CustomInput
inline
type='checkbox'
id='exampleCustomCheckbox'
label='전체'
name='aprvlYn'
value='A'
// checked={true}
checked={checkState.all}
onChange={handleChangeCheckbox}
/>
<CustomInput
inline
type='checkbox'
id='exampleCustomCheckbox2'
label='승인'
name='aprvlYn'
value='Y'
checked={checkState.yes}
onChange={handleChangeCheckbox}
/>
<CustomInput
inline
type='checkbox'
id='exampleCustomCheckbox3'
label='미승인'
name='aprvlYn'
value='N'
checked={checkState.no}
onChange={handleChangeCheckbox}
/>
</div>
</div>
</div>
</div>
</dt>
</dl>
</div>
{/* </CardBody> */}
</dt>
</dl>
</div>
</CardBody>
</Card>
</Col>
</Row>

93
src/components/basis/flight/plan/FlightPlanGrid.js
Unescape View File

@ -67,57 +67,52 @@ const FlightPlanGrid = ({
];
return (
<div className='mt-2'>
<Row>
<Col>
<div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
<h4>비행계획서 신청 목록</h4>
<span className='search-case'>
검색결과 총 {!!planListData ? planListData.length : 0}건
</span>
</div>
<div className='d-flex align-items-center'>
<Button.Ripple
color='primary'
size='sm'
onClick={movePage}
{...(isMyGroup ? {} : { disabled: true })}
>
{/* 계획서 생성 */}
비행계획서 신청
</Button.Ripple>
</div>
</div>
<div className='invoice-list-wrapper'>
<Card>
<div className='invoice-list-dataTable'>
{loading ? (
<div className='grid-loading'>
<div>
<Spinner color='primary' />
<span>Loading...</span>
</div>
</div>
) : null}
<GridDatabase
title={'비행이력'}
data={planListData}
columns={columns}
count={!!planListData ? planListData.length : 0}
pagination={pagination}
paginationPerPage={paginationPerPage}
paginationRowsPerPageOptions={paginationRowsPerPageOptions}
handlerPageChange={handlerPageChange}
total={total}
/>
{/* 검색된 데이터가 없습니다. */}
<>
<div className='mt-2 cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
<h4>비행계획서 신청 목록</h4>
<span className='search-case'>
검색결과 총 {!!planListData ? planListData.length : 0}건
</span>
</div>
<div className='d-flex align-items-center'>
<Button.Ripple
color='primary'
size='sm'
onClick={movePage}
{...(isMyGroup ? {} : { disabled: true })}
>
비행계획서 신청
</Button.Ripple>
</div>
</div>
<div className='invoice-list-wrapper'>
<Card>
<div className='invoice-list-dataTable'>
{loading ? (
<div className='grid-loading'>
<div>
<Spinner color='primary' />
<span>Loading...</span>
</div>
</div>
</Card>
) : null}
<GridDatabase
title={'비행이력'}
data={planListData}
columns={columns}
count={!!planListData ? planListData.length : 0}
pagination={pagination}
paginationPerPage={paginationPerPage}
paginationRowsPerPageOptions={paginationRowsPerPageOptions}
handlerPageChange={handlerPageChange}
total={total}
/>
{/* 검색된 데이터가 없습니다. */}
</div>
</Col>
</Row>
</div>
</Card>
</div>
</>
);
};

6
src/components/basis/group/BasisGroupApprovalGrid.js
Unescape View File

@ -4,9 +4,6 @@ import { ExcelExportButton } from '../../crud/excel/ExcelExportButton';
export const BasisGroupApprovalGrid = props => {
return (
// <div className='pal-card-box'>
// <Row>
// <Col>
<>
<div className='mt-2 cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
@ -32,8 +29,5 @@ export const BasisGroupApprovalGrid = props => {
</Card>
</div>
</>
// </Col>
// </Row>
// </div>
);
};

1
src/components/basis/group/BasisGroupApprovalSearch.js
Unescape View File

@ -110,7 +110,6 @@ export const BasisGroupApprovalSearch = props => {
};
return (
// <div className='pal-card-box'>
<div>
<Row>
<Col>

18
src/components/basis/group/BasisGroupGrid.js
Unescape View File

@ -3,30 +3,15 @@ import { Card, Row, Col, Button } from 'reactstrap';
export const BasisGroupGrid = props => {
return (
// <div className='pal-card-box'>
// <Row>
// <Col>
<>
<div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
<div>
<h4>{props.title} 목록</h4>
<span className='search-case'>검색결과 총 {props.count}건</span>
</div>
{/* <div className='d-flex align-items-center'>
<Button.Ripple
color='primary'
size='sm'
onClick={props.handlerGroupCreate}
>
그룹생성
</Button.Ripple>
</div> */}
</div>
<div className='invoice-list-wrapper'>
<Card>
{/* <div className='grid-loading'>
<div><Spinner color='primary' /><span>Loading...</span></div>
</div> */}
<div className='invoice-list-dataTable'>
<GridDatabase
title={'비행이력'}
@ -41,8 +26,5 @@ export const BasisGroupGrid = props => {
</Card>
</div>
</>
// </Col>
// </Row>
// </div>
);
};

Write Preview
Loading…
Cancel
Save