master
parent
470bcbd160
commit
c1291aa38a
|
|
@ -30,7 +30,7 @@ function Add(props) {
|
||||||
isRegulatory: 1,
|
isRegulatory: 1,
|
||||||
});
|
});
|
||||||
if (success) {
|
if (success) {
|
||||||
message.success("操作成功");
|
message.success(`${query.id ? "编辑" : "新增"}成功`);
|
||||||
props.history.goBack();
|
props.history.goBack();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -73,12 +73,12 @@ function List(props) {
|
||||||
>
|
>
|
||||||
查看
|
查看
|
||||||
</Button>
|
</Button>
|
||||||
{props.permission("qy-promise-template-disable") && (
|
{(props.permission("qy-promise-template-disable") && record.isRegulatory === 1) && (
|
||||||
<Button type="link" onClick={() => updateState(record.id, record.state)}>
|
<Button type="link" onClick={() => updateState(record.id, record.state)}>
|
||||||
{record.state === 0 ? "禁用" : "启用"}
|
{record.state === 0 ? "禁用" : "启用"}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{props.permission("qy-promise-template-edit") && (
|
{(props.permission("qy-promise-template-edit") && record.isRegulatory === 1) && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ function Add(props) {
|
||||||
|
|
||||||
const onSubmit = async (values) => {
|
const onSubmit = async (values) => {
|
||||||
await isExistenceDuplicateSelection({ data: values.promisePersons, key: "postId", message: `承诺人岗位不能重复` });
|
await isExistenceDuplicateSelection({ data: values.promisePersons, key: "postId", message: `承诺人岗位不能重复` });
|
||||||
const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + item.userName.length, 0);
|
const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + (Array.isArray(item.userName) ? item.userName.length : 1), 0);
|
||||||
const persons = values.promisePersons.map(item => ({
|
const persons = values.promisePersons.map(item => ({
|
||||||
...item,
|
...item,
|
||||||
userName: item.userName.join(","),
|
userName: item.userName.join(","),
|
||||||
|
|
@ -104,7 +104,7 @@ function Add(props) {
|
||||||
peopleNumInvolved,
|
peopleNumInvolved,
|
||||||
});
|
});
|
||||||
if (success) {
|
if (success) {
|
||||||
message.success("操作成功");
|
message.success(`${query.id ? "编辑" : "新增"}成功`);
|
||||||
props.history.goBack();
|
props.history.goBack();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ function Add(props) {
|
||||||
isRegulatory: 0,
|
isRegulatory: 0,
|
||||||
});
|
});
|
||||||
if (success) {
|
if (success) {
|
||||||
message.success("操作成功");
|
message.success(`${query.id ? "编辑" : "新增"}成功`);
|
||||||
props.history.goBack();
|
props.history.goBack();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ function Add(props) {
|
||||||
...item,
|
...item,
|
||||||
isPromisePeople: 1,
|
isPromisePeople: 1,
|
||||||
}));
|
}));
|
||||||
const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + item.userName.length, 0);
|
const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + (Array.isArray(item.userName) ? item.userName.length : 1), 0);
|
||||||
const persons = values.promisePersons.map(item => ({
|
const persons = values.promisePersons.map(item => ({
|
||||||
...item,
|
...item,
|
||||||
userName: Array.isArray(item.userName) ? item.userName.join(",") : item.userName,
|
userName: Array.isArray(item.userName) ? item.userName.join(",") : item.userName,
|
||||||
|
|
@ -107,7 +107,7 @@ function Add(props) {
|
||||||
peopleNumInvolved,
|
peopleNumInvolved,
|
||||||
});
|
});
|
||||||
if (success) {
|
if (success) {
|
||||||
message.success("操作成功");
|
message.success(`${query.id ? "编辑" : "新增"}成功`);
|
||||||
props.history.goBack();
|
props.history.goBack();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -123,11 +123,6 @@ function List(props) {
|
||||||
render: (_, record) => getLabelName({ list: PROMISE_TYPE_ENUM, status: record.promiseType }),
|
render: (_, record) => getLabelName({ list: PROMISE_TYPE_ENUM, status: record.promiseType }),
|
||||||
},
|
},
|
||||||
{ title: "安全承诺级别", dataIndex: "levelName", hidden: query.releasePlatform === "2" },
|
{ title: "安全承诺级别", dataIndex: "levelName", hidden: query.releasePlatform === "2" },
|
||||||
{
|
|
||||||
title: "下发对象",
|
|
||||||
dataIndex: "releasePlatform",
|
|
||||||
render: (_, record) => getLabelName({ list: RELEASE_PLATFORM_ENUM, status: record.releasePlatform }),
|
|
||||||
},
|
|
||||||
{ title: "签订单位", dataIndex: "corpName", hidden: query.releasePlatform === "2" },
|
{ title: "签订单位", dataIndex: "corpName", hidden: query.releasePlatform === "2" },
|
||||||
{ title: "适用期限", render: (_, record) => `${record.promiseTermStart}至${record.promiseTermEnd}` },
|
{ title: "适用期限", render: (_, record) => `${record.promiseTermStart}至${record.promiseTermEnd}` },
|
||||||
{ title: "涉及岗位", dataIndex: "postNames" },
|
{ title: "涉及岗位", dataIndex: "postNames" },
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ const DetailModal = (props) => {
|
||||||
<div className="hairdresser">
|
<div className="hairdresser">
|
||||||
<div className="promiser">
|
<div className="promiser">
|
||||||
发状人:
|
发状人:
|
||||||
{form.promisePeople}
|
{typeof form.promisePeople === "string" ? form.promisePeople : form.promisePeople.userName}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue