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