Merge remote-tracking branch 'origin/master'
commit
ba34af1fe6
|
|
@ -63,18 +63,40 @@ function List(props) {
|
||||||
fixed: "right",
|
fixed: "right",
|
||||||
width: 150,
|
width: 150,
|
||||||
render: (_, record) => (
|
render: (_, record) => (
|
||||||
|
|
||||||
<Space>
|
<Space>
|
||||||
{props.permission(record.projectStatus === 1 ? "xmsh-gfd-ffbxmsh-btn-sh" : "xmsh-gfd-ffbxmsh-btn-ck") && (
|
{props.permission("xmsh-gfd-ffbxmsh-btn-ck") && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./reView?id=${record.id}&projectStatusLast=1`);
|
props.history.push(`./reView?id=${record.id}`);
|
||||||
}}
|
}}
|
||||||
disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2}
|
|
||||||
>
|
>
|
||||||
{record.projectStatus === 1 ? "审核" : "查看"}
|
查看
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{props.permission("xmsh-gfd-ffbxmsh-btn-sh") && (record.projectStatus === 1 || record.projectStatus === 3) && (
|
||||||
|
<Button
|
||||||
|
type="link"
|
||||||
|
onClick={() => {
|
||||||
|
props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`);
|
||||||
|
}}
|
||||||
|
disabled={record.currentUserCanAudit === 2}
|
||||||
|
>
|
||||||
|
审核
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
{/*{props.permission(record.projectStatus === 1 ? "xmsh-gfd-ffbxmsh-btn-sh" : "xmsh-gfd-ffbxmsh-btn-ck") && (*/}
|
||||||
|
{/* <Button*/}
|
||||||
|
{/* type="link"*/}
|
||||||
|
{/* onClick={() => {*/}
|
||||||
|
{/* props.history.push(`./reView?id=${record.id}&projectStatusLast=1`);*/}
|
||||||
|
{/* }}*/}
|
||||||
|
{/* disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2}*/}
|
||||||
|
{/* >*/}
|
||||||
|
{/* {record.projectStatus === 1 ? "审核" : "查看"}*/}
|
||||||
|
{/* </Button>*/}
|
||||||
|
{/*)}*/}
|
||||||
{(props.permission("xmsh-gfd-ffbxmsh-btn-ckbhyy") && record.projectStatus === 6) && (
|
{(props.permission("xmsh-gfd-ffbxmsh-btn-ckbhyy") && record.projectStatus === 6) && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
|
|
|
||||||
|
|
@ -66,17 +66,38 @@ function List(props) {
|
||||||
width: 150,
|
width: 150,
|
||||||
render: (_, record) => (
|
render: (_, record) => (
|
||||||
<Space>
|
<Space>
|
||||||
{props.permission(record.projectStatus === 1 ? "xmsh-gfd-fbxmsh-btn-sh" : "xmsh-gfd-fbxmsh-btn-ck") && (
|
{props.permission("xmsh-gfd-fbxmsh-btn-ck") && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./reView?id=${record.id}&projectStatusLast=1`);
|
props.history.push(`./reView?id=${record.id}`);
|
||||||
}}
|
}}
|
||||||
disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2}
|
|
||||||
>
|
>
|
||||||
{record.projectStatus === 1 ? "审核" : "查看"}
|
查看
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{props.permission("xmsh-gfd-fbxmsh-btn-sh") && (record.projectStatus === 1 || record.projectStatus === 3) && (
|
||||||
|
<Button
|
||||||
|
type="link"
|
||||||
|
onClick={() => {
|
||||||
|
props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`);
|
||||||
|
}}
|
||||||
|
disabled={record.currentUserCanAudit === 2}
|
||||||
|
>
|
||||||
|
审核
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
{/* {props.permission(record.projectStatus === 1 ? "xmsh-gfd-fbxmsh-btn-sh" : "xmsh-gfd-fbxmsh-btn-ck") && ( */}
|
||||||
|
{/* <Button */}
|
||||||
|
{/* type="link" */}
|
||||||
|
{/* onClick={() => { */}
|
||||||
|
{/* props.history.push(`./reView?id=${record.id}&projectStatusLast=1`); */}
|
||||||
|
{/* }} */}
|
||||||
|
{/* disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2} */}
|
||||||
|
{/* > */}
|
||||||
|
{/* {record.projectStatus === 1 ? "审核" : "查看"} */}
|
||||||
|
{/* </Button> */}
|
||||||
|
{/* )} */}
|
||||||
{(props.permission("xmsh-gfd-fbxmsh-btn-ckbhyy") && record.projectStatus === 6) && (
|
{(props.permission("xmsh-gfd-fbxmsh-btn-ckbhyy") && record.projectStatus === 6) && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue