@@ -116,29 +96,26 @@ const UserMaintainPage_Individual = () => {
{/*col 1*/}
-
+
-
-
-
-
+
+
-
-
-
- Files
-
+
+
+ Files
+
+
-
-
+
+
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/IAmSmartRegister.js b/src/pages/authentication/IAmSmartRegister.js
index b3d77fc..2e4c7be 100644
--- a/src/pages/authentication/IAmSmartRegister.js
+++ b/src/pages/authentication/IAmSmartRegister.js
@@ -56,6 +56,7 @@ const Register = () => {
const [completed, setCompleted] = useState([false]);
const [updateValid, setUpdateValid] = useState(false);
const [base64Url, setBase64Url] = useState("")
+ const [checkCode, setCheckCode] = useState("")
const [idNo, setIdNo] = useState("");
const totalSteps = () => {
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/ApiPathConst.js b/src/utils/ApiPathConst.js
index b621d70..e59de2f 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -77,6 +77,7 @@ export const SET_PUBLIC_NOTICE_STATUS_COMPLATED = apiPath+'/application/applicat
export const SET_PUBLIC_NOTICE_STATUS_WITHDRAW = apiPath+'/application/application-detail-status-withdrawn';
export const SET_PUBLIC_NOTICE_STATUS_RESUBMIT = apiPath+'/application/application-detail-status-resubmit';
export const SET_PUBLIC_NOTICE_STATUS_REVIEWED = apiPath+'/application/application-detail-status-reviewed';
+export const SET_PUBLIC_NOTICE_STATUS_PUBLISH = apiPath+'/application/application-detail-status-publish';
export const UPDATE_PUBLIC_NOTICE_APPLY_DETAIL = apiPath+'/application/save';
export const GET_ISSUE_COMBO = apiPath+'/gazette-issue/combo';
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
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js
index 1577fc5..8e6fb02 100644
--- a/src/utils/FieldUtils.js
+++ b/src/utils/FieldUtils.js
@@ -27,12 +27,12 @@ export const getDateField = ({ label, valueName, form, disabled }) => {
}
export const getTextField = ({ label, valueName, form, disabled }) => {
- return
-
+
{label}
-
+
{initField({
type: "text",
valueName: valueName,
@@ -71,7 +71,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
export const getPhoneField = ({ label, valueName, form, disabled }) => {
- return
+ return
{label}
@@ -123,7 +123,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
-
+
{initField({
type: "text",
valueName: valueName[0],
@@ -131,7 +131,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
disabled: disabled
})}
-
+
{initField({
type: "text",
valueName: valueName[1],
@@ -139,7 +139,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
disabled: disabled
})}
-
+
{initField({
type: "text",
valueName: valueName[2],
@@ -152,7 +152,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
}
export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => {
- return
+ return
{label}
diff --git a/src/utils/statusUtils/PublicNoteStatusUtils.js b/src/utils/statusUtils/PublicNoteStatusUtils.js
index 07e42ce..8fddc1b 100644
--- a/src/utils/statusUtils/PublicNoteStatusUtils.js
+++ b/src/utils/statusUtils/PublicNoteStatusUtils.js
@@ -3,17 +3,17 @@
import {getStatusTag} from "utils/statusUtils/Base";
export function getStatus(params) {
- return getStatusByText(params.row.status);
+ return getStatusByText(params.row.status, params.row.creditor);
}
-export function getStatusByText(status) {
+export function getStatusByText(status, creditor) {
switch (status) {
case "submitted":
return getStatusTag({ color: "#f5a83d", text: "處理中" })
case "reviewed":
return getStatusTag({ color: "#f5a83d", text: "處理中" })
case "confirmed":
- if (localStorage.getItem('userData').creditor)
+ if (creditor)
return getStatusTag({ color: "#22a13f", text: "待發布" })
else
return getStatusTag({ color: "#22a13f", text: "待付款" })
@@ -37,16 +37,16 @@ export function getStatusByText(status) {
}
export function getStatusEng(params) {
- return getStatusByTextEng(params.row.status);
+ return getStatusByTextEng(params.row.status, params.row.creditor);
}
-export function getStatusByTextEng(status) {
+export function getStatusByTextEng(status, creditor) {
switch (status) {
case "submitted":
return getStatusTag({ color: "#f5a83d", text: "Submitted" })
case "reviewed":
return getStatusTag({ color: "#0C489E", text: "Reviewed" })
case "confirmed":
- if (localStorage.getItem('userData').creditor)
+ if (creditor)
return getStatusTag({ color: "#22a13f", text: "Pending Publish" })
else
return getStatusTag({ color: "#22a13f", text: "Pending Payment" })