Merge remote-tracking branch 'origin/master'
commit
01566aa377
|
|
@ -39,8 +39,8 @@ function List(props) {
|
|||
const { tableProps, getData } = useTable(props["inspectionList"], {
|
||||
form,
|
||||
transform: formData => ({
|
||||
checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0] + " 00:00:00") : "",
|
||||
checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1] + " 23:59:59") : "",
|
||||
checkStartTime: formData.checkTime?.[0] ? (`${formData.checkTime[0]} 00:00:00`) : "",
|
||||
checkEndTime: formData.checkTime?.[1] ? (`${formData.checkTime[1]} 23:59:59`) : "",
|
||||
}),
|
||||
params: {
|
||||
entrance: "0",
|
||||
|
|
@ -199,7 +199,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
|
||||
props.history.push(query.entrance === "statistics" ? `../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`);
|
||||
}}
|
||||
>
|
||||
查看
|
||||
|
|
|
|||
Loading…
Reference in New Issue