优化HiddenInfo
parent
43049705f2
commit
dcdff455e0
|
|
@ -31,6 +31,8 @@ function HiddenInfo(props) {
|
||||||
hiddenRectifyUserCO: [],
|
hiddenRectifyUserCO: [],
|
||||||
hiddenConfirmUserCO: [],
|
hiddenConfirmUserCO: [],
|
||||||
hiddenAcceptUserCO: [],
|
hiddenAcceptUserCO: [],
|
||||||
|
hiddenAcceptQualifiedUserCO: [],
|
||||||
|
hiddenAcceptUnqualifiedUserCO: [],
|
||||||
hiddenInspecCO: {},
|
hiddenInspecCO: {},
|
||||||
hiddenSpecialList: [],
|
hiddenSpecialList: [],
|
||||||
hiddenExtensionList: [],
|
hiddenExtensionList: [],
|
||||||
|
|
@ -81,13 +83,15 @@ function HiddenInfo(props) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (info.isQualified === 1 && (info.hiddenAcceptUserCO && info.hiddenAcceptUserCO.length > 0)) {
|
if (info.hiddenAcceptUserCO && info.hiddenAcceptUserCO.length > 0) {
|
||||||
for (let i = 0; i < info.hiddenAcceptUserCO.length; i++) {
|
for (let i = 0; i < info.hiddenAcceptUserCO.length; i++) {
|
||||||
const acceptImageFiles = await getFile({
|
if (info.hiddenAcceptUserCO[i].hiddenUserId) {
|
||||||
eqType: UPLOAD_FILE_TYPE_ENUM["5"],
|
const acceptImageFiles = await getFile({
|
||||||
eqForeignKey: hiddenId || query[hiddenIdKey],
|
eqType: UPLOAD_FILE_TYPE_ENUM["5"],
|
||||||
});
|
eqForeignKey: info.hiddenAcceptUserCO[i].hiddenUserId,
|
||||||
setAcceptImageFiles(prevState => [...prevState, acceptImageFiles]);
|
});
|
||||||
|
setAcceptImageFiles(prevState => [...prevState, acceptImageFiles]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,6 +106,18 @@ function HiddenInfo(props) {
|
||||||
|
|
||||||
const getData = async () => {
|
const getData = async () => {
|
||||||
request(!history ? `/hidden/hidden/${id || query[idKey]}` : `/hidden/hidden/history/${id || query[idKey]}`, "get").then((res) => {
|
request(!history ? `/hidden/hidden/${id || query[idKey]}` : `/hidden/hidden/history/${id || query[idKey]}`, "get").then((res) => {
|
||||||
|
res.data.hiddenAcceptQualifiedUserCO = [];
|
||||||
|
res.data.hiddenAcceptUnqualifiedUserCO = [];
|
||||||
|
if (res.data.hiddenAcceptUserCO && res.data.hiddenAcceptUserCO.length > 0) {
|
||||||
|
for (let i = 0; i < res.data.hiddenAcceptUserCO.length; i++) {
|
||||||
|
if (res.data.hiddenAcceptUserCO[i].status === 1) {
|
||||||
|
res.data.hiddenAcceptQualifiedUserCO.push(res.data.hiddenAcceptUserCO[i]);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
res.data.hiddenAcceptUnqualifiedUserCO.push(res.data.hiddenAcceptUserCO[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
setInfo(res.data);
|
setInfo(res.data);
|
||||||
getFileData(res.data);
|
getFileData(res.data);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
|
|
@ -189,7 +205,7 @@ function HiddenInfo(props) {
|
||||||
? [
|
? [
|
||||||
{
|
{
|
||||||
label: "整改期限",
|
label: "整改期限",
|
||||||
children: dayjs(info.hiddenUserPresetsCO.rectifyDeadline).format("YYYY-MM-DD"),
|
children: info.hiddenUserPresetsCO.rectifyDeadline ? dayjs(info.hiddenUserPresetsCO.rectifyDeadline).format("YYYY-MM-DD") : "",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
: []),
|
: []),
|
||||||
|
|
@ -252,31 +268,27 @@ function HiddenInfo(props) {
|
||||||
...(item.createTime ? [{ label: "申请延期日期", children: item.createTime }] : []),
|
...(item.createTime ? [{ label: "申请延期日期", children: item.createTime }] : []),
|
||||||
...(item.delayTime ? [{ label: "延期日期", children: item.delayTime }] : []),
|
...(item.delayTime ? [{ label: "延期日期", children: item.delayTime }] : []),
|
||||||
...(item.updateName ? [{ label: "审核人", children: item.updateName }] : []),
|
...(item.updateName ? [{ label: "审核人", children: item.updateName }] : []),
|
||||||
...(item.state === 3
|
...(item.disposalPlan ? [{ label: "处置方案", children: item.disposalPlan }] : []),
|
||||||
? [
|
...(item.disposalFile
|
||||||
...(item.disposalPlan ? [{ label: "处置方案", children: item.disposalPlan }] : []),
|
? [{
|
||||||
...(item.disposalFile
|
label: "处置方案附件",
|
||||||
? [{
|
children: (
|
||||||
label: "处置方案附件",
|
getFileSuffix(item.disposalFile) === "pdf"
|
||||||
children: (
|
? <PreviewPdf name={getFileName(item.disposalFile)} url={item.disposalFile} />
|
||||||
getFileSuffix(item.disposalFile) === "pdf"
|
: (
|
||||||
? <PreviewPdf name={getFileName(item.disposalFile)} url={item.disposalFile} />
|
<Space>
|
||||||
: (
|
<span>{getFileName(item.disposalFile)}</span>
|
||||||
<Space>
|
<Button
|
||||||
<span>{getFileName(item.disposalFile)}</span>
|
type="primary"
|
||||||
<Button
|
size="small"
|
||||||
type="primary"
|
onClick={() => downloadFile(item.disposalFile)}
|
||||||
size="small"
|
>
|
||||||
onClick={() => downloadFile(item.disposalFile)}
|
下载
|
||||||
>
|
</Button>
|
||||||
下载
|
</Space>
|
||||||
</Button>
|
)
|
||||||
</Space>
|
),
|
||||||
)
|
}]
|
||||||
),
|
|
||||||
}]
|
|
||||||
: []),
|
|
||||||
]
|
|
||||||
: []),
|
: []),
|
||||||
{
|
{
|
||||||
label: "延期审核状态",
|
label: "延期审核状态",
|
||||||
|
|
@ -426,54 +438,55 @@ function HiddenInfo(props) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
(info.hiddenAcceptUserCO && info.hiddenAcceptUserCO.length > 0)
|
info.hiddenAcceptQualifiedUserCO.length > 0
|
||||||
? (
|
? (
|
||||||
info.isQualified === 1
|
<>
|
||||||
? (
|
<Divider orientation="left">验收信息</Divider>
|
||||||
<>
|
{
|
||||||
<Divider orientation="left">验收信息</Divider>
|
info.hiddenAcceptQualifiedUserCO.map((item, index) => (
|
||||||
{
|
<Descriptions
|
||||||
info.hiddenAcceptUserCO.map((item, index) => (
|
key={item.id}
|
||||||
<Descriptions
|
bordered
|
||||||
key={item.id}
|
column={1}
|
||||||
bordered
|
styles={{ label: { width: 200 } }}
|
||||||
column={1}
|
items={[
|
||||||
styles={{ label: { width: 200 } }}
|
{ label: "验收部门", children: item.deptName },
|
||||||
items={[
|
{ label: "验收人", children: item.userName },
|
||||||
{ label: "验收部门", children: item.deptName },
|
{ label: "验收时间", children: item.rectificationTime },
|
||||||
{ label: "验收人", children: item.userName },
|
...(item.repulseCause ? [{ label: "验收打回意见", children: item.repulseCause }] : []),
|
||||||
{ label: "验收时间", children: item.rectificationTime },
|
{ label: "是否合格", children: item.rectificationTime ? "合格" : "" },
|
||||||
...(item.repulseCause ? [{ label: "验收打回意见", children: item.repulseCause }] : []),
|
...(item.descr ? [{ label: "验收描述", children: item.descr }] : []),
|
||||||
{ label: "是否合格", children: item.rectificationTime ? "合格" : "" },
|
...((acceptImageFiles[index] && acceptImageFiles[index].length > 0) ? [{ label: "验收图片", children: <PreviewImg files={acceptImageFiles[index]} /> }] : []),
|
||||||
...(item.descr ? [{ label: "验收描述", children: item.descr }] : []),
|
]}
|
||||||
...((acceptImageFiles[index] && acceptImageFiles[index].length > 0) ? [{ label: "验收图片", children: <PreviewImg files={acceptImageFiles[index]} /> }] : []),
|
/>
|
||||||
]}
|
))
|
||||||
/>
|
}
|
||||||
))
|
</>
|
||||||
}
|
)
|
||||||
</>
|
: null
|
||||||
)
|
}
|
||||||
: (
|
{
|
||||||
<>
|
info.hiddenAcceptUnqualifiedUserCO.length > 0
|
||||||
<Divider orientation="left">验收打回信息</Divider>
|
? (
|
||||||
{
|
<>
|
||||||
info.hiddenAcceptUserCO.map(item => (
|
<Divider orientation="left">验收打回信息</Divider>
|
||||||
<Descriptions
|
{
|
||||||
key={item.id}
|
info.hiddenAcceptUnqualifiedUserCO.map(item => (
|
||||||
bordered
|
<Descriptions
|
||||||
column={1}
|
key={item.id}
|
||||||
styles={{ label: { width: 200 } }}
|
bordered
|
||||||
items={[
|
column={1}
|
||||||
{ label: "验收部门", children: item.deptName },
|
styles={{ label: { width: 200 } }}
|
||||||
{ label: "验收人", children: item.userName },
|
items={[
|
||||||
{ label: "验收时间", children: item.rectificationTime },
|
{ label: "验收部门", children: item.deptName },
|
||||||
{ label: "验收打回意见", children: item.repulseCause },
|
{ label: "验收人", children: item.userName },
|
||||||
]}
|
{ label: "验收时间", children: item.rectificationTime },
|
||||||
/>
|
{ label: "验收打回意见", children: item.repulseCause },
|
||||||
))
|
]}
|
||||||
}
|
/>
|
||||||
</>
|
))
|
||||||
)
|
}
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
: null
|
: null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue