Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev
commit
bd0739f37f
|
|
@ -67,7 +67,7 @@ const SiteReviewNotice = (props) => {
|
||||||
}, [resultModalOpen]);
|
}, [resultModalOpen]);
|
||||||
|
|
||||||
const handleSearch = () => {
|
const handleSearch = () => {
|
||||||
|
|
||||||
queryQualOnSiteReviewPage({
|
queryQualOnSiteReviewPage({
|
||||||
...router.query,
|
...router.query,
|
||||||
});
|
});
|
||||||
|
|
@ -162,7 +162,7 @@ const SiteReviewNotice = (props) => {
|
||||||
|
|
||||||
const handleSubmitResult = () => {
|
const handleSubmitResult = () => {
|
||||||
resultForm.validateFields().then((values) => {
|
resultForm.validateFields().then((values) => {
|
||||||
|
|
||||||
|
|
||||||
const payload = {
|
const payload = {
|
||||||
id: currentResultRow.id,
|
id: currentResultRow.id,
|
||||||
|
|
@ -183,13 +183,13 @@ const SiteReviewNotice = (props) => {
|
||||||
const columns = [
|
const columns = [
|
||||||
{ title: "机构名称", dataIndex: "unitName", ellipsis: true },
|
{ title: "机构名称", dataIndex: "unitName", ellipsis: true },
|
||||||
{
|
{
|
||||||
title: "现场审查时间", dataIndex: "reviewDateStart", width: 180,
|
title: "现场审查时间", dataIndex: "reviewDateStart",
|
||||||
render: (val) => val ? dayjs(val).format("YYYY-MM-DD HH:mm") : "-",
|
render: (val) => val ? dayjs(val).format("YYYY-MM-DD HH:mm") : "-",
|
||||||
},
|
},
|
||||||
{ title: "审查地点", dataIndex: "reviewLocation", width: 200, ellipsis: true },
|
{ title: "审查地点", dataIndex: "reviewLocation", ellipsis: true },
|
||||||
{ title: "审查组成员", dataIndex: "reviewMembers", width: 140, ellipsis: true },
|
{ title: "审查组成员", dataIndex: "reviewMembers", ellipsis: true },
|
||||||
{
|
{
|
||||||
title: "状态", dataIndex: "status", width: 120,
|
title: "状态", dataIndex: "status",
|
||||||
render: (status) => {
|
render: (status) => {
|
||||||
const cfg = ON_SITE_REVIEW_STATUS_MAP[status];
|
const cfg = ON_SITE_REVIEW_STATUS_MAP[status];
|
||||||
return cfg ? <Tag color={cfg.color}>{cfg.label}</Tag> : (status || "-");
|
return cfg ? <Tag color={cfg.color}>{cfg.label}</Tag> : (status || "-");
|
||||||
|
|
@ -411,4 +411,4 @@ const SiteReviewNotice = (props) => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Connect([NS_QUAL_REVIEW], true)(AntdTableFuncControl(SiteReviewNotice));
|
export default Connect([NS_QUAL_REVIEW], true)(AntdTableFuncControl(SiteReviewNotice));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue