浏览代码

add statusUtils folder

master
Anna Ho 1年前
父节点
当前提交
d9881d7118
共有 16 个文件被更改,包括 20 次插入26 次删除
  1. +1
    -1
      src/pages/ProofReply_GLD/ApplicationDetails.js
  2. +1
    -1
      src/pages/ProofReply_GLD/index.js
  3. +1
    -1
      src/pages/ProofReply_Public/ApplicationDetails.js
  4. +1
    -1
      src/pages/PublicNotice/ListPanel/BaseGrid.js
  5. +1
    -1
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  6. +1
    -1
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
  7. +1
    -1
      src/pages/PublicNoticeDetail/ApplicationDetailCard.js
  8. +0
    -1
      src/pages/PublicNoticeDetail/tabTableDetail/BaseGrid.js
  9. +0
    -2
      src/pages/PublicNoticeDetail/tabTableDetail/ProofTab.js
  10. +2
    -6
      src/pages/PublicNoticeDetail/tabTableDetail/StatusHistoryTab.js
  11. +1
    -1
      src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js
  12. +0
    -1
      src/pages/PublicNoticeDetail_GLD/tabTableDetail/BaseGrid.js
  13. +1
    -1
      src/pages/PublicNoticeDetail_GLD/tabTableDetail/StatusHistoryTab.js
  14. +1
    -1
      src/pages/PublicNoticeSearch_GLD/DataGrid.js
  15. +6
    -0
      src/utils/statusUtils/Base.js
  16. +2
    -6
      src/utils/statusUtils/PublicNoteStatusUtils.js

+ 1
- 1
src/pages/ProofReply_GLD/ApplicationDetails.js 查看文件

@@ -13,7 +13,7 @@ import * as DateUtils from "utils/DateUtils"
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import FileList from "components/FileList" import FileList from "components/FileList"
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //
const ApplicationDetailCard = ({ formData, }) => { const ApplicationDetailCard = ({ formData, }) => {


+ 1
- 1
src/pages/ProofReply_GLD/index.js 查看文件

@@ -90,7 +90,7 @@ const Index = () => {
<Grid item xs={12} width="100%"> <Grid item xs={12} width="100%">
<div style={BackgroundHead} width="100%"> <div style={BackgroundHead} width="100%">
<Stack direction="row" height='70px'> <Stack direction="row" height='70px'>
<Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>校對記錄</Typography>
<Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>Proof Record</Typography>
</Stack> </Stack>
</div> </div>
</Grid> </Grid>


+ 1
- 1
src/pages/ProofReply_Public/ApplicationDetails.js 查看文件

@@ -14,7 +14,7 @@ import * as DateUtils from "utils/DateUtils"
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import FileList from "components/FileList" import FileList from "components/FileList"
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //
const ApplicationDetailCard = ({ formData, }) => { const ApplicationDetailCard = ({ formData, }) => {


+ 1
- 1
src/pages/PublicNotice/ListPanel/BaseGrid.js 查看文件

@@ -5,7 +5,7 @@ import {
Button Button
} from '@mui/material'; } from '@mui/material';
import * as DateUtils from "utils/DateUtils" import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "./PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";


// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


+ 1
- 1
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js 查看文件

@@ -8,7 +8,7 @@ import {
} from '@mui/material'; } from '@mui/material';
import {FiDataGrid} from "components/FiDataGrid"; import {FiDataGrid} from "components/FiDataGrid";
import * as DateUtils from "utils/DateUtils" import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "./PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //




+ 1
- 1
src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js 查看文件

@@ -4,7 +4,7 @@ import {
Button Button
} from '@mui/material'; } from '@mui/material';
import * as DateUtils from "utils/DateUtils"; import * as DateUtils from "utils/DateUtils";
import * as StatusUtils from "./PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import {FiDataGrid} from "components/FiDataGrid"; import {FiDataGrid} from "components/FiDataGrid";
// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


+ 1
- 1
src/pages/PublicNoticeDetail/ApplicationDetailCard.js 查看文件

@@ -22,7 +22,7 @@ import { lazy } from 'react';
const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent')));
// import {useParams} from "react-router-dom"; // import {useParams} from "react-router-dom";
import * as HttpUtils from "utils/HttpUtils" import * as HttpUtils from "utils/HttpUtils"
import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import * as DateUtils from "utils/DateUtils"; import * as DateUtils from "utils/DateUtils";


// import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined'; // import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined';


+ 0
- 1
src/pages/PublicNoticeDetail/tabTableDetail/BaseGrid.js 查看文件

@@ -7,7 +7,6 @@ import {
Button Button
} from '@mui/material'; } from '@mui/material';
import * as DateUtils from "utils/DateUtils" import * as DateUtils from "utils/DateUtils"
// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


export default function BaseGrid({rows}) { export default function BaseGrid({rows}) {


+ 0
- 2
src/pages/PublicNoticeDetail/tabTableDetail/ProofTab.js 查看文件

@@ -6,8 +6,6 @@ import {
import { import {
Button Button
} from '@mui/material'; } from '@mui/material';
// import * as DateUtils from "utils/DateUtils"
// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


export default function ProofTab({rows}) { export default function ProofTab({rows}) {


+ 2
- 6
src/pages/PublicNoticeDetail/tabTableDetail/StatusHistoryTab.js 查看文件

@@ -3,12 +3,8 @@ import * as React from 'react';
import { import {
DataGrid, DataGrid,
} from "@mui/x-data-grid"; } from "@mui/x-data-grid";
// import dayjs from "dayjs";
// import {
// Button
// } from '@mui/material';
// import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "../../PublicNotice/ListPanel/PublicNoteStatusUtils";

import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";


// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //




+ 1
- 1
src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js 查看文件

@@ -20,7 +20,7 @@ import Loadable from 'components/Loadable';
import { lazy } from 'react'; import { lazy } from 'react';
const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent')));
import * as HttpUtils from "utils/HttpUtils" import * as HttpUtils from "utils/HttpUtils"
import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";


import DoneIcon from '@mui/icons-material/Done'; import DoneIcon from '@mui/icons-material/Done';
import CloseIcon from '@mui/icons-material/Close'; import CloseIcon from '@mui/icons-material/Close';


+ 0
- 1
src/pages/PublicNoticeDetail_GLD/tabTableDetail/BaseGrid.js 查看文件

@@ -5,7 +5,6 @@ import {
Button Button
} from '@mui/material'; } from '@mui/material';
import * as DateUtils from "utils/DateUtils" import * as DateUtils from "utils/DateUtils"
// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


export default function BaseGrid({rows}) { export default function BaseGrid({rows}) {


+ 1
- 1
src/pages/PublicNoticeDetail_GLD/tabTableDetail/StatusHistoryTab.js 查看文件

@@ -6,7 +6,7 @@ import {FiDataGrid} from "components/FiDataGrid";
// Button // Button
// } from '@mui/material'; // } from '@mui/material';
import * as DateUtils from "utils/DateUtils" import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "../../PublicNotice/ListPanel/PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";


// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //




+ 1
- 1
src/pages/PublicNoticeSearch_GLD/DataGrid.js 查看文件

@@ -4,7 +4,7 @@ import {
Button Button
} from '@mui/material'; } from '@mui/material';
import * as DateUtils from "utils/DateUtils"; import * as DateUtils from "utils/DateUtils";
import * as StatusUtils from "pages/PublicNotice/ListPanel/PublicNoteStatusUtils";
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import {FiDataGrid} from "components/FiDataGrid"; import {FiDataGrid} from "components/FiDataGrid";
// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


+ 6
- 0
src/utils/statusUtils/Base.js 查看文件

@@ -0,0 +1,6 @@

export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) {
return (
<div style={{ borderRadius: "25px", "background": color, "color": textColor, "padding": "5px 10px 5px 10px" }}><b>{text}</b></div>
)
}

src/pages/PublicNotice/ListPanel/PublicNoteStatusUtils.js → src/utils/statusUtils/PublicNoteStatusUtils.js 查看文件

@@ -1,5 +1,7 @@




import {getStatusTag} from "utils/statusUtils/Base";

export function getStatus(params) { export function getStatus(params) {
return getStatusByText(params.row.status); return getStatusByText(params.row.status);
} }
@@ -66,9 +68,3 @@ export function getStatusByTextEng(status) {
return getStatusTag({ text: status }) return getStatusTag({ text: status })
} }
} }

export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) {
return (
<div style={{ borderRadius: "25px", "background": color, "color": textColor, "padding": "5px 10px 5px 10px" }}><b>{text}</b></div>
)
}

正在加载...
取消
保存