diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index ae2e54b..0509884 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -58,7 +58,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(),
brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')),
brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼`)), function (value) {
- var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/
+ var brNo_pattern = /[0-9]{8}/
if (value !== undefined) {
if (value.match(brNo_pattern)) {
return true
diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
index ccd54ae..9f21937 100644
--- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
+++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
@@ -55,10 +55,10 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
phoneNumber: yup.string().min(8, displayErrorMsg('請輸入有效聯絡電話')).required(displayErrorMsg('請輸入聯絡電話')),
faxNumber: yup.string().min(8).nullable(),
brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')),
- brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234-123-12-12-1)`)), function (value) {
- var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/
+ brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`)), function (value) {
+ var brNo_pattern = /[0-9]{8}/
if (value !== undefined) {
- if (value.match(brNo_pattern)) {
+ if (value.size==8 && value.match(brNo_pattern)) {
return true
} else {
return false
diff --git a/src/pages/Organization/SearchPage/OrganizationSearchForm.js b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
index a525710..987e284 100644
--- a/src/pages/Organization/SearchPage/OrganizationSearchForm.js
+++ b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
@@ -4,23 +4,24 @@ import {
CardContent,
Grid, TextField,
Typography,
- Checkbox, FormControlLabel,
+ Autocomplete,
} from '@mui/material';
-import MainCard from "../../../components/MainCard";
+import MainCard from "components/MainCard";
import { useForm } from "react-hook-form";
import { useState } from "react";
import * as React from "react";
-import * as UrlUtils from "../../../utils/ApiPathConst";
-import * as HttpUtils from "../../../utils/HttpUtils";
+import * as UrlUtils from "utils/ApiPathConst";
+import * as HttpUtils from "utils/HttpUtils";
+import * as ComboData from "utils/ComboData";
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const OrganizationSearchForm = ({ applySearch }) => {
const [type, setType] = useState([]);
-
+ const [creditorSelected, setCreditorSelected] = React.useState({ key: 0, labelCht: '全部', label: 'All', type: 'all' });
const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => {
@@ -34,8 +35,12 @@ const OrganizationSearchForm = ({ applySearch }) => {
brNo: data.brNo,
enCompanyName: data.enCompanyName,
chCompanyName: data.chCompanyName,
- searchCreditor: data.searchCreditor
};
+ if(creditorSelected.type == 'true'){
+ temp["creditor"] = true;
+ }else if(creditorSelected.type == 'false'){
+ temp["creditor"] = false;
+ }
applySearch(temp);
};
@@ -102,12 +107,26 @@ const OrganizationSearchForm = ({ applySearch }) => {
- }
- label="Search Creditor Only"
- id="searchCreditor"
- />
+ {
+ setCreditorSelected(newValue);
+ }}
+ getOptionLabel={(option) => option.label}
+ renderInput={(params) => (
+
+ )}
+ />
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index ffe3012..2994b10 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -148,7 +148,8 @@ const ApplicationDetailCard = (
onClick={() => { checkExprityDate(true) }}
disabled={currentApplicationDetailData.status == "rejected"
|| currentApplicationDetailData.status == "cancelled"
- || currentApplicationDetailData.status == "paid"}
+ || currentApplicationDetailData.status == "paid"
+ || currentApplicationDetailData.creditor}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
index 3b61561..0c4e812 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
@@ -59,8 +59,8 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
phoneNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).required(displayErrorMsg('請輸入聯絡電話')),
faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(),
brExpiryDate: yup.string().min(8, displayErrorMsg('請輸入商業登記證有效日期')),
- brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234-123-12-12-1)`), function (value) {
- var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/
+ brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`), function (value) {
+ var brNo_pattern = /[0-9]{8}/
if (value !== undefined) {
if (value.match(brNo_pattern)) {
return true
diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
index d4cd73a..60210ac 100644
--- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
@@ -526,8 +526,9 @@ const BusCustomFormWizard = (props) => {
phone: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')).required(displayErrorMsg('請輸入聯絡電話')),
fax: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')),
brExpiryDate: yup.date().min(new Date().toISOString().split("T")[0], displayErrorMsg('請輸入商業登記證有效日期')).max("2099-12-31", displayErrorMsg('請輸入商業登記證有效日期')).required(displayErrorMsg('請輸入商業登記證有效日期')),
- brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234-123-12-12-1)`), function (value) {
- var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/
+ brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`), function (value) {
+ // var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/
+ var brNo_pattern = /[0-9]{8}/
if (value !== undefined) {
if (value.match(brNo_pattern)) {
return true
@@ -834,7 +835,7 @@ const BusCustomFormWizard = (props) => {
- 商業登記證號碼 (e.g. 12341234-123-12-12-1)
+ 商業登記證號碼 (e.g. 12341234)
*
diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js
index fd5c65e..8bf4d40 100644
--- a/src/utils/ComboData.js
+++ b/src/utils/ComboData.js
@@ -86,4 +86,10 @@ export const denmandNoteStatus = [
{ key: 2, labelCht: '待支付', label:'To be Paid', type: 'to be paid' },
{ key: 3, labelCht: '已付費', label:'Paid', type: 'paid' },
+];
+
+export const CreditorStatus = [
+ { key: 0, labelCht: '全部', label: 'All', type: 'all' },
+ { key: 1, labelCht: '債權人', label:'Creditor', type: 'true' },
+ { key: 2, labelCht: '非債權人', label:'No-Creditor', type: 'false' },
];
\ No newline at end of file