浏览代码

add setting, Proof Date -> Proof Issue Date

master
Anna Ho 1年前
父节点
当前提交
e6f75c960a
共有 4 个文件被更改,包括 54 次插入18 次删除
  1. +1
    -1
      src/pages/Proof/Search_GLD/DataGrid.js
  2. +2
    -2
      src/pages/Proof/Search_GLD/SearchForm.js
  3. +1
    -1
      src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
  4. +50
    -14
      src/pages/Setting/SystemSetting/Form.js

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

@@ -59,7 +59,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'created', id: 'created',
field: 'created', field: 'created',
headerName: 'Proof Date',
headerName: 'Proof Issue Date',
flex: 1, flex: 1,
valueGetter: (params) => { valueGetter: (params) => {
return DateUtils.datetimeStr(params?.value); return DateUtils.datetimeStr(params?.value);


+ 2
- 2
src/pages/Proof/Search_GLD/SearchForm.js 查看文件

@@ -206,7 +206,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
{...register("dateFrom")} {...register("dateFrom")}
id="dateFrom" id="dateFrom"
type="date" type="date"
label="Proof Date (From)"
label="Proof Issue Date (From)"
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }} InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => { onChange={(newValue) => {
@@ -233,7 +233,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}} }}
id="dateTo" id="dateTo"
type="date" type="date"
label="Proof Date(To)"
label="Proof Issue Date(To)"
defaultValue={searchCriteria.dateTo} defaultValue={searchCriteria.dateTo}
/> />
</Grid> </Grid>


+ 1
- 1
src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js 查看文件

@@ -56,7 +56,7 @@ export default function ProofTab({rows}) {
}, },
{ {
field: 'created', field: 'created',
headerName: 'Proof Date',
headerName: 'Proof Issue Date',
width: isMdOrLg ? 'auto' : 160, width: isMdOrLg ? 'auto' : 160,
flex: isMdOrLg ? 1 : undefined, flex: isMdOrLg ? 1 : undefined,




+ 50
- 14
src/pages/Setting/SystemSetting/Form.js 查看文件

@@ -6,6 +6,7 @@ import {
// InputAdornment, // InputAdornment,
Typography, FormLabel, Typography, FormLabel,
OutlinedInput, OutlinedInput,
TextField,
} from '@mui/material'; } from '@mui/material';
import MainCard from "components/MainCard"; import MainCard from "components/MainCard";
import * as React from "react"; import * as React from "react";
@@ -16,6 +17,7 @@ import * as React from "react";
const Form = ({ selectedItem, onSave }) => { const Form = ({ selectedItem, onSave }) => {
const [data, setData] = React.useState({}); const [data, setData] = React.useState({});
const [value, setValue] = React.useState(""); const [value, setValue] = React.useState("");
const [valueErr, setValueErr] = React.useState("");


React.useEffect(() => { React.useEffect(() => {
//if user data from parent are not null //if user data from parent are not null
@@ -44,7 +46,7 @@ const Form = ({ selectedItem, onSave }) => {
<Grid container> <Grid container>
<Grid item xs={12} s={12} md={12} lg={12} sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}> <Grid item xs={12} s={12} md={12} lg={12} sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
<Grid container alignItems={"center"}> <Grid container alignItems={"center"}>
<Grid item xs={2}
<Grid item xs={2}
sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}>
<FormLabel>Name:</FormLabel> <FormLabel>Name:</FormLabel>
</Grid> </Grid>
@@ -59,7 +61,7 @@ const Form = ({ selectedItem, onSave }) => {


<Grid item xs={12} s={12} md={12} lg={12} sx={{ ml: 3, mr: 3, mb: 3 }}> <Grid item xs={12} s={12} md={12} lg={12} sx={{ ml: 3, mr: 3, mb: 3 }}>
<Grid container alignItems={"center"}> <Grid container alignItems={"center"}>
<Grid item xs={2}
<Grid item xs={2}
sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}>
<FormLabel >Type:</FormLabel> <FormLabel >Type:</FormLabel>
</Grid> </Grid>
@@ -88,27 +90,61 @@ const Form = ({ selectedItem, onSave }) => {


<Grid item xs={12} s={12} md={12} lg={12} sx={{ ml: 3, mr: 3, mb: 3 }}> <Grid item xs={12} s={12} md={12} lg={12} sx={{ ml: 3, mr: 3, mb: 3 }}>
<Grid container alignItems={"center"}> <Grid container alignItems={"center"}>
<Grid item xs={2}
sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}>
<Grid item xs={12}
sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'top' }}>
<FormLabel>Value:</FormLabel> <FormLabel>Value:</FormLabel>
</Grid> </Grid>


<Grid item xs={8}>
<Grid item xs={12} sx={{ ml: 3, mr: 3 }}>

<FormControl variant="outlined" fullWidth required> <FormControl variant="outlined" fullWidth required>
<OutlinedInput
fullWidth
size="small"
value={value}
onChange={(event)=>{
setValue(event.target.value);
}}
/>
{
data?.type != "HTML" ?
<OutlinedInput
fullWidth
size="small"
value={value}
error={valueErr}
onChange={(event) => {
setValueErr("");
setValue(event.target.value);
}}
/>
:
<TextField
variant="outlined"
multiline
rows={15}
value={value}
inputComponent='textarea'
error={valueErr}
onChange={(event) => {
setValue(event.target.value);
if (event.target.value.length >= 1000) {
setValueErr("The number of characters cannot exceed 1000 words.");
return;
}
setValueErr("");
}}
InputProps={
{
style: { minHeight: '42.5px', maxHeight: '50vh', height: 'auto' },
}
}
/>

}
<span style={{ color: "red" }}>{valueErr}</span>
</FormControl> </FormControl>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Button onClick={()=>{onSave({ name: data.name, value:value})}}>Save</Button>
<Button onClick={() => {
if (valueErr.length > 0) return;
onSave({ name: data.name, value: value })
}}>Save</Button>
</form> </form>
</> </>
: :


正在加载...
取消
保存