diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx index 5eb1177..7993c9f 100644 --- a/web/client/src/sections/problem/components/tableData.jsx +++ b/web/client/src/sections/problem/components/tableData.jsx @@ -379,7 +379,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition placeholder={SkeletonScreen()} > {(() => { - // console.log(tableData); + // console.log(route); return { + dispatch(service.getProjectStructure({ pomsProjectId:value.join(',') })).then((res) => { if (res.success) { let mylist = [] for (let i = 0; i < res.payload?.data.length; i++) { @@ -188,6 +188,7 @@ function pushModal (props) { } } if (key == 'pomsProjectId') { + getProjectStructureList(values.pomsProjectId)//获取绑定项目下结构物 for (let i = 0; i < projectPoms.length; i++) { if (values.pomsProjectId == projectPoms[i].id) { @@ -232,6 +233,7 @@ function pushModal (props) { style={{ width: 695 }} rules={[{ required: true, message: "请选择项目" }]} initValue={editObj?.pomsProjectId || ""} + multiple filter > { diff --git a/web/client/src/sections/service/containers/emPush.jsx b/web/client/src/sections/service/containers/emPush.jsx index ca73760..c0d9307 100644 --- a/web/client/src/sections/service/containers/emPush.jsx +++ b/web/client/src/sections/service/containers/emPush.jsx @@ -245,17 +245,27 @@ const EmPush = (props) => { dataIndex: "projectName", key: "projectName", render: (_, row) => { + let projectData = [] + row.pomsProject?.map(v => { + projectData.push({ + projectName: v.pepProject?.projectName, + name: v.name, + anxinerror: v.del, + constructionStatus: v.pepProject?.constructionStatus, + }) + }) let anxinerror = false let anxinerrorArr = '' if (row.pomsProject.del == true) { anxinerror = true anxinerrorArr = row.pomsProject.pepProject?.projectName || row.pomsProject.name } + return ( -
+ projectData.map((u, index) =>
{ - anxinerror ? ( - + u.anxinerror ? ( +
@@ -263,17 +273,17 @@ const EmPush = (props) => { } {
- -
7 || row.pomsProject?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: row.pomsProject.del ? '#F93920' : '' }}> - {row.pomsProject.pepProject?.projectName || row.pomsProject.name} + +
7 || u.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: row.pomsProject.del ? '#F93920' : '' }}> + {u.projectName || u.name}
} { - row.pomsProject?.pepProject?.projectName ? ( + u.projectName ? (
@@ -281,15 +291,7 @@ const EmPush = (props) => {
- { - val.map((ite, idx) => { - return ( -
- {ite.id == row.pomsProject?.pepProject.constructionStatusId ? ite.construction_status : ''} -
- ) - }) - } + {u.constructionStatus}
) : ( @@ -307,7 +309,7 @@ const EmPush = (props) => {
) } -
+ ) ) } },