优化:隐患部位根据被检查企业查询、只有监管端才在改变被检查单位的时候清除隐患
parent
8c629309b3
commit
b364742157
|
|
@ -86,7 +86,7 @@ function HiddenAddModal(props) {
|
|||
<Form.Item name="hiddenPart" noStyle>
|
||||
{
|
||||
hiddenPartType === "select"
|
||||
? <HiddenPartSelectTree />
|
||||
? <HiddenPartSelectTree isNeedCorpInfoId={true} params={{ eqCorpinfoId: props.personUnderInspectionCorpId }} />
|
||||
: <Input placeholder="请输入隐患部位" />
|
||||
}
|
||||
</Form.Item>
|
||||
|
|
|
|||
|
|
@ -91,7 +91,8 @@ function Add(props) {
|
|||
pageSize: 999,
|
||||
});
|
||||
setHiddenList(hiddenList);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
form.setFieldsValue({
|
||||
inspectorList: [{
|
||||
departmentId: userInfo.departmentId,
|
||||
|
|
@ -231,7 +232,7 @@ function Add(props) {
|
|||
|
||||
if (hiddenList[index].hiddenPartType === "input") {
|
||||
const { data } = await props["partAdd"]({ hiddenregion: hiddenList[index].hiddenPart });
|
||||
hiddenList[index].hiddenPart = data
|
||||
hiddenList[index].hiddenPart = data;
|
||||
}
|
||||
|
||||
const hiddenImageFiles = await getFile({
|
||||
|
|
@ -245,7 +246,7 @@ function Add(props) {
|
|||
hiddenId: id,
|
||||
state: isDraft === 0 ? 102 : 98,
|
||||
foreignKey: traceId,
|
||||
corpId: corpId,
|
||||
corpId,
|
||||
tenantId: corpId,
|
||||
hiddenJson: JSON.stringify({
|
||||
confirm: 1,
|
||||
|
|
@ -380,8 +381,10 @@ function Add(props) {
|
|||
form.setFieldValue(["personUnderInspection", "corpId"], "");
|
||||
form.setFieldValue(["personUnderInspection", "corpName"], "");
|
||||
|
||||
deleteHiddenIds.current.push(...hiddenList.map(item => item.id).filter(Boolean))
|
||||
setHiddenList([])
|
||||
if (props.source === "4") {
|
||||
deleteHiddenIds.current.push(...hiddenList.map(item => item.id).filter(Boolean));
|
||||
setHiddenList([]);
|
||||
}
|
||||
}}
|
||||
/>
|
||||
),
|
||||
|
|
@ -523,7 +526,7 @@ function Add(props) {
|
|||
type="primary"
|
||||
onClick={() => {
|
||||
if (!form.getFieldValue(["personUnderInspection", "corpId"])) {
|
||||
message.warning("请选择被检查人员")
|
||||
message.warning("请选择被检查人员");
|
||||
return;
|
||||
}
|
||||
setHiddenDiscovererUserList(getHiddenDiscovererUserList());
|
||||
|
|
@ -548,7 +551,8 @@ function Add(props) {
|
|||
onClick={async () => {
|
||||
if (record.hiddenId) {
|
||||
getCurrentHiddenInfo(record.id, record.hiddenId);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
setCurrentHiddenInfo({ ...record });
|
||||
}
|
||||
setHiddenDiscovererUserList(getHiddenDiscovererUserList());
|
||||
|
|
@ -617,10 +621,12 @@ function Add(props) {
|
|||
setHiddenAddModalOpen(false);
|
||||
setCurrentHiddenInfo({});
|
||||
}}
|
||||
personUnderInspectionCorpId={form.getFieldValue(["personUnderInspection", "corpId"])}
|
||||
onConfirm={(values) => {
|
||||
if (currentHiddenIndex.current === -1) {
|
||||
setHiddenList([...hiddenList, values]);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
setHiddenList(
|
||||
hiddenList.map((item, index) => {
|
||||
if (index === currentHiddenIndex.current)
|
||||
|
|
|
|||
Loading…
Reference in New Issue