alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

combo clear function

master
Anna Ho 1 year ago
parent
9644746725
commit
4efd7f3994
9 changed files with 43 additions and 37 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -23
      src/pages/DemandNote/Search/SearchForm.js
  2. +8
    -2
      src/pages/Organization/SearchPage/OrganizationSearchForm.js
  3. +4
    -1
      src/pages/Payment/Search_GLD/SearchForm.js
  4. +2
    -0
      src/pages/Payment/Search_Public/SearchForm.js
  5. +2
    -0
      src/pages/Proof/Search_Public/SearchForm.js
  6. +6
    -2
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
  7. +7
    -8
      src/pages/PublicNotice/Search_GLD/SearchForm.js
  8. +4
    -1
      src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
  9. +2
    -0
      src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js

+ 8
- 23
src/pages/DemandNote/Search/SearchForm.js View File

@@ -21,13 +21,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
}) => { }) => {


const [type, setType] = React.useState([]); const [type, setType] = React.useState([]);
// const [status, setStatus] = React.useState({ key: 0, label: 'All', type: 'all' });
const [orgSelected, setOrgSelected] = React.useState({}); const [orgSelected, setOrgSelected] = React.useState({});
const [orgCombo, setOrgCombo] = React.useState(); const [orgCombo, setOrgCombo] = React.useState();
const [issueSelected, setIssueSelected] = React.useState({}); const [issueSelected, setIssueSelected] = React.useState({});
const [issueCombo, setIssueCombo] = React.useState([]); const [issueCombo, setIssueCombo] = React.useState([]);
const [selectedStatus, setSelectedStatus] = React.useState([]);
const [selectedLabelsString, setSelectedLabelsString] = React.useState('');
const [selectedStatus, setSelectedStatus] = React.useState(ComboData.denmandNoteStatus[0]);


const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
@@ -41,7 +39,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue


const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {
data.status = selectedLabelsString
data.status = selectedStatus?.type;
let typeArray = []; let typeArray = [];


for (let i = 0; i < type.length; i++) { for (let i = 0; i < type.length; i++) {
@@ -57,7 +55,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
dateTo: data.dateTo, dateTo: data.dateTo,
dueDateFrom: data.dueDateFrom, dueDateFrom: data.dueDateFrom,
dueDateTo: data.dueDateTo, dueDateTo: data.dueDateTo,
status: (data.status === '' || data.status.includes("all")) ? "" : data.status,
status: (data?.status === '' || data?.status?.includes("all")) ? "" : data.status,
}; };
applySearch(temp); applySearch(temp);
}; };
@@ -77,9 +75,9 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue


function resetForm() { function resetForm() {
setType([]); setType([]);
// setStatus({ key: 0, label: 'All', type: 'all' });
setOrgSelected({}); setOrgSelected({});
setIssueSelected({}); setIssueSelected({});
setSelectedStatus(ComboData.denmandNoteStatus[0]);
reset(); reset();
} }


@@ -136,9 +134,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""} inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
getOptionLabel={(option) => getIssueLabel(option)} getOptionLabel={(option) => getIssueLabel(option)}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) {
setIssueSelected(newValue);
}
setIssueSelected(newValue);
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
@@ -176,9 +172,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
value={orgSelected} value={orgSelected}
inputValue={(orgSelected?.label) ? orgSelected?.label : ""} inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) {
setOrgSelected(newValue); setOrgSelected(newValue);
}
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
@@ -291,25 +285,16 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue


<Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
<Autocomplete <Autocomplete
multiple
size="small" size="small"
{...register("status")} {...register("status")}
id="status" id="status"
options={ComboData.denmandNoteStatus} options={ComboData.denmandNoteStatus}
value={selectedStatus} value={selectedStatus}
onChange={(event, newValue) => { onChange={(event, newValue) => {
const findAllIndex = newValue.findIndex((ele) => {
return ele.type === "all"
})

if (findAllIndex > -1) {
setSelectedStatus([newValue[findAllIndex]]);
setSelectedLabelsString('all')
} else {
const selectedLabels = newValue.map(option => option.type);
const selectedLabelsString = `${selectedLabels.join(',')}`;
if(newValue==null){
setSelectedStatus(ComboData.denmandNoteStatus[0]);
}else{
setSelectedStatus(newValue); setSelectedStatus(newValue);
setSelectedLabelsString(selectedLabelsString);
} }
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}


+ 8
- 2
src/pages/Organization/SearchPage/OrganizationSearchForm.js View File

@@ -22,7 +22,7 @@ import {ThemeProvider} from "@emotion/react";
const OrganizationSearchForm = ({ applySearch }) => { const OrganizationSearchForm = ({ applySearch }) => {


const [type, setType] = useState([]); const [type, setType] = useState([]);
const [creditorSelected, setCreditorSelected] = React.useState({ key: 0, labelCht: '全部', label: 'All', type: 'all' });
const [creditorSelected, setCreditorSelected] = React.useState(ComboData.CreditorStatus[0]);
const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {


@@ -47,6 +47,7 @@ const OrganizationSearchForm = ({ applySearch }) => {


function resetForm() { function resetForm() {
setType([]); setType([]);
setCreditorSelected(ComboData.CreditorStatus[0]);
reset(); reset();
} }


@@ -117,7 +118,12 @@ const OrganizationSearchForm = ({ applySearch }) => {
options={ComboData.CreditorStatus} options={ComboData.CreditorStatus}
value={creditorSelected} value={creditorSelected}
onChange={(event, newValue) => { onChange={(event, newValue) => {
setCreditorSelected(newValue);
if(newValue == null){
setCreditorSelected(ComboData.CreditorStatus[0]);
}else{
setCreditorSelected(newValue);
}
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
renderInput={(params) => ( renderInput={(params) => (


+ 4
- 1
src/pages/Payment/Search_GLD/SearchForm.js View File

@@ -36,6 +36,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
}; };


function resetForm() { function resetForm() {
setStatus(ComboData.paymentStatus[0]);
reset(); reset();
} }


@@ -134,7 +135,9 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
inputValue={status?.label ? status?.label : ""} inputValue={status?.label ? status?.label : ""}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) {
if(newValue==null){
setStatus(ComboData.paymentStatus[0]);
}else{
setStatus(newValue); setStatus(newValue);
} }
}} }}


+ 2
- 0
src/pages/Payment/Search_Public/SearchForm.js View File

@@ -144,6 +144,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) { if (newValue !== null) {
setStatus(newValue); setStatus(newValue);
}else{
setStatus(ComboData.paymentStatus[0]);
} }
}} }}
renderInput={(params) => ( renderInput={(params) => (


+ 2
- 0
src/pages/Proof/Search_Public/SearchForm.js View File

@@ -268,6 +268,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) { if (newValue !== null) {
setStatus(newValue); setStatus(newValue);
}else{
setStatus(ComboData.proofStatus[0]);
} }
}} }}
renderInput={(params) => ( renderInput={(params) => (


+ 6
- 2
src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js View File

@@ -22,7 +22,7 @@ import {FormattedMessage, useIntl} from "react-intl";
const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
const intl = useIntl(); const intl = useIntl();
const [type, setType] = React.useState([]); const [type, setType] = React.useState([]);
const [status, setStatus] = React.useState({ key: 0, label: 'all', type: 'all' });
const [status, setStatus] = React.useState(localStorage.getItem('userData').creditor?ComboData.publicNoticeStatic_Creditor[0]:ComboData.publicNoticeStatic[0]);


const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
@@ -52,7 +52,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {


function resetForm() { function resetForm() {
setType([]); setType([]);
setStatus({ key: 0, label: 'All', labelCht: "全部", type: 'all' });
setStatus(localStorage.getItem('userData').creditor?ComboData.publicNoticeStatic_Creditor[0]:ComboData.publicNoticeStatic[0]);
reset(); reset();
} }


@@ -165,7 +165,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
// inputValue={status?.labelCht} // inputValue={status?.labelCht}
getOptionLabel={(option) => intl.formatMessage({id: option.label})} getOptionLabel={(option) => intl.formatMessage({id: option.label})}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if(newValue ==null){
setStatus(localStorage.getItem('userData').creditor?ComboData.publicNoticeStatic_Creditor[0]:ComboData.publicNoticeStatic[0]);
}else{
setStatus(newValue); setStatus(newValue);
}
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}


+ 7
- 8
src/pages/PublicNotice/Search_GLD/SearchForm.js View File

@@ -37,7 +37,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
const marginBottom = 2.5; const marginBottom = 2.5;
const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {
data.status = selectedStatus.type
data.status = selectedStatus?.type
let typeArray = []; let typeArray = [];


for (let i = 0; i < type.length; i++) { for (let i = 0; i < type.length; i++) {
@@ -49,7 +49,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
dateFrom: data.dateFrom, dateFrom: data.dateFrom,
dateTo: data.dateTo, dateTo: data.dateTo,
contact: data.contact, contact: data.contact,
status: (data.status === '' || data.status.includes("all")) ? "" : data.status,
status: (data.status === '' || data.status?.includes("all")) ? "" : data.status,
orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "", orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "",
issueId: issueSelected?.id, issueId: issueSelected?.id,
groupNo: data.groupNo, groupNo: data.groupNo,
@@ -194,8 +194,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
options={ComboData.publicNoticeStatic_GLD} options={ComboData.publicNoticeStatic_GLD}
value={selectedStatus} value={selectedStatus}
onChange={(event, newValue) => { onChange={(event, newValue) => {
setSelectedStatus(newValue);

if(newValue==null){
setSelectedStatus(ComboData.publicNoticeStatic_GLD[0]);
}else{
setSelectedStatus(newValue);
}
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
renderInput={(params) => ( renderInput={(params) => (
@@ -255,9 +258,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
value={orgSelected} value={orgSelected}
inputValue={(orgSelected?.label) ? orgSelected?.label : ""} inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) {
setOrgSelected(newValue); setOrgSelected(newValue);
}
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
@@ -283,9 +284,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""} inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
getOptionLabel={(option) => getIssueLabel(option)} getOptionLabel={(option) => getIssueLabel(option)}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) {
setIssueSelected(newValue); setIssueSelected(newValue);
}
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}


+ 4
- 1
src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js View File

@@ -17,7 +17,7 @@ import {ThemeProvider} from "@emotion/react";
const UserSearchForm_Individual = ({ applySearch }) => { const UserSearchForm_Individual = ({ applySearch }) => {


const [type, setType] = useState([]); const [type, setType] = useState([]);
const [accountFilter, setAccountFilter] = useState("Active");
const [accountFilter, setAccountFilter] = useState("All");


const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {
@@ -42,6 +42,7 @@ const UserSearchForm_Individual = ({ applySearch }) => {


function resetForm() { function resetForm() {
setType([]); setType([]);
setAccountFilter("All");
reset(); reset();
} }


@@ -120,6 +121,8 @@ const UserSearchForm_Individual = ({ applySearch }) => {
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null) { if (newValue !== null) {
setAccountFilter(newValue); setAccountFilter(newValue);
}else{
setAccountFilter("All");
} }
}} }}
renderInput={(params) => ( renderInput={(params) => (


+ 2
- 0
src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js View File

@@ -147,6 +147,8 @@ const UserSearchForm_Organization = ({applySearch}) => {
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null){ if (newValue !== null){
setAccountFilter(newValue); setAccountFilter(newValue);
}else{
setAccountFilter("All");
} }
}} }}
renderInput={(params) => ( renderInput={(params) => (


Write Preview
Loading…
Cancel
Save