fix(inspection): 解决检查模块中的企业ID传递和部门筛选问题
- 在隐患提交方法中添加corpId参数传递 - 修复partAdd接口调用的数据结构问题 - 为隐患数据添加corpId和tenantId字段 - 更新被检查单位负责人选择逻辑，使用正确的字段名 - 添加被检查单位企业ID必填验证 - 清空隐患列表时同时清除已删除隐患ID - 限制被检查单位部门选择只显示企业类型为2的单位 - 统一监督端检查列表搜索类型从all改为inType - 升级zy-react-library依赖版本master
parent
1dcb7f8fb0
commit
4640dcd68a
|
|
@ -32,7 +32,7 @@
|
|||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-to-print": "^3.2.0",
|
||||
"zy-react-library": "^1.1.34"
|
||||
"zy-react-library": "^1.1.36"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^5.4.1",
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ function Add(props) {
|
|||
};
|
||||
|
||||
// 保存隐患
|
||||
const handleHiddenSubmit = async (traceId, isDraft, index) => {
|
||||
const handleHiddenSubmit = async (traceId, isDraft, index, corpId) => {
|
||||
await deleteFile({
|
||||
single: false,
|
||||
files: hiddenList[index].deleteHiddenImageFiles,
|
||||
|
|
@ -230,7 +230,7 @@ function Add(props) {
|
|||
});
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
|
|
@ -245,6 +245,8 @@ function Add(props) {
|
|||
hiddenId: id,
|
||||
state: isDraft === 0 ? 102 : 98,
|
||||
foreignKey: traceId,
|
||||
corpId: corpId,
|
||||
tenantId: corpId,
|
||||
hiddenJson: JSON.stringify({
|
||||
confirm: 1,
|
||||
rectify: 1,
|
||||
|
|
@ -258,7 +260,7 @@ function Add(props) {
|
|||
};
|
||||
|
||||
// 处理隐患数据
|
||||
const handleHiddenData = async (traceId, isDraft) => {
|
||||
const handleHiddenData = async (traceId, isDraft, corpId) => {
|
||||
// 删除隐患
|
||||
if (deleteHiddenIds.current.length > 0) {
|
||||
props["hiddenDelete"]({ids: deleteHiddenIds.current.join(",")});
|
||||
|
|
@ -281,7 +283,7 @@ function Add(props) {
|
|||
|
||||
// 新增/更新隐患
|
||||
for (let i = 0; i < hiddenList.length; i++) {
|
||||
await handleHiddenSubmit(traceId, isDraft, i);
|
||||
await handleHiddenSubmit(traceId, isDraft, i, corpId);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -301,8 +303,8 @@ function Add(props) {
|
|||
// 提交主表单数据
|
||||
const {traceId} = await submitInspectionData(values, situationList, inspectorList, signatureResult, isDraft);
|
||||
|
||||
// 处理隐患数据
|
||||
await handleHiddenData(traceId, isDraft);
|
||||
// 处理隐患数据 {name: ["personUnderInspection", "corpId"], label: "被检查单位现场负责人企业id", onlyForLabel: true},
|
||||
await handleHiddenData(traceId, isDraft, values.personUnderInspection?.corpId);
|
||||
|
||||
message.success("操作成功");
|
||||
props.history.goBack();
|
||||
|
|
@ -377,6 +379,9 @@ function Add(props) {
|
|||
form.setFieldValue(["personUnderInspection", "userName"], "");
|
||||
form.setFieldValue(["personUnderInspection", "corpId"], "");
|
||||
form.setFieldValue(["personUnderInspection", "corpName"], "");
|
||||
|
||||
deleteHiddenIds.current.push(...hiddenList.map(item => item.id).filter(Boolean))
|
||||
setHiddenList([])
|
||||
}}
|
||||
/>
|
||||
),
|
||||
|
|
@ -390,8 +395,8 @@ function Add(props) {
|
|||
params={{departmentId: personUnderInspectionDepartmentId}}
|
||||
onGetLabel={label => form.setFieldValue(["personUnderInspection", "userName"], label)}
|
||||
onGetOption={(option) => {
|
||||
form.setFieldValue(["personUnderInspection", "corpId"], option.corpId);
|
||||
form.setFieldValue(["personUnderInspection", "corpName"], option.corpName);
|
||||
form.setFieldValue(["personUnderInspection", "corpId"], option.corpinfoId);
|
||||
form.setFieldValue(["personUnderInspection", "corpName"], option.corpinfoName);
|
||||
}}
|
||||
/>
|
||||
),
|
||||
|
|
@ -517,6 +522,10 @@ function Add(props) {
|
|||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
if (!form.getFieldValue(["personUnderInspection", "corpId"])) {
|
||||
message.warning("请选择被检查人员")
|
||||
return;
|
||||
}
|
||||
setHiddenDiscovererUserList(getHiddenDiscovererUserList());
|
||||
setCurrentHiddenInfo({});
|
||||
currentHiddenIndex.current = -1;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ function List(props) {
|
|||
{ name: "inspectionUserName", label: "检查人" },
|
||||
{ name: "type", label: "检查类型", render: <DictionarySelectTree dictValue="inspectionType" onlyLastLevel /> },
|
||||
{ name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
||||
{ name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.searchType} /> },
|
||||
{ name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.searchType} params={{enterpriseType: [2]}}/> },
|
||||
{ name: "inspectedUserName", label: "被检查单位现场负责人" },
|
||||
]}
|
||||
form={form}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ function List(props) {
|
|||
{ name: "inspectionUserName", label: "检查人" },
|
||||
{ name: "type", label: "检查类型", render: <DictionarySelectTree dictValue="inspectionType" onlyLastLevel /> },
|
||||
{ name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATETIME_RANGE },
|
||||
{ name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.searchType} /> },
|
||||
{ name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.searchType} params={{enterpriseType: [2]}} /> },
|
||||
{ name: "inspectedUserName", label: "被检查单位现场负责人" },
|
||||
]}
|
||||
form={form}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ function List(props) {
|
|||
{
|
||||
name: "inspectedDepartmentId",
|
||||
label: "被检查单位",
|
||||
render: <DepartmentSelectTree searchType={props.searchType}/>
|
||||
render: <DepartmentSelectTree searchType={props.searchType} params={{enterpriseType: [2]}}/>
|
||||
},
|
||||
{name: "inspectedUserName", label: "被检查单位现场负责人"},
|
||||
{name: "status", label: "检查状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: INSPECTION_STATE_ENUM},
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ const AddModalComponent = (props) => {
|
|||
const { getUserInfo } = useGetUserInfo();
|
||||
|
||||
const getCorpInfoList = async () => {
|
||||
const { data } = await props["corpInfoList"]({ pageSize: 9999, pageIndex: 1, enterpriseType: [2] });
|
||||
const { data } = await props["corpInfoList"]({ pageSize: 9999, pageIndex: 1, enterpriseType: 2 });
|
||||
setCorpInfoList(data);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import InspectionList from "~/pages/Container/BranchCompany/Inspection/Inspection/List";
|
||||
|
||||
function List(props) {
|
||||
return <InspectionList addPermissionKey="inspection-jg-check-add" updatePermissionKey="inspection-jg-check-edit" searchType="all" {...props} />;
|
||||
return <InspectionList addPermissionKey="inspection-jg-check-add" updatePermissionKey="inspection-jg-check-edit" searchType="inType" {...props} />;
|
||||
}
|
||||
|
||||
export default List;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import InspectorList from "~/pages/Container/BranchCompany/Inspection/Inspector/List";
|
||||
|
||||
function List(props) {
|
||||
return <InspectorList verifyPermissionKey="inspection-jg-check-verify-edit" searchType="all" {...props} />;
|
||||
return <InspectorList verifyPermissionKey="inspection-jg-check-verify-edit" searchType="inType" {...props} />;
|
||||
}
|
||||
|
||||
export default List;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import RecordsList from "~/pages/Container/BranchCompany/Inspection/Records/List";
|
||||
|
||||
function List(props) {
|
||||
return <RecordsList searchType="all" deletePermissionKey="inspection-jg-list-del" exportPermissionKey="inspection-jg-list-dc" {...props} />;
|
||||
return <RecordsList searchType="inType" deletePermissionKey="inspection-jg-list-del" exportPermissionKey="inspection-jg-list-dc" {...props} />;
|
||||
}
|
||||
|
||||
export default List;
|
||||
|
|
|
|||
Loading…
Reference in New Issue