Commit 92b47d99 authored by 罗新东's avatar 罗新东

修改了‘隐患详情’隐患认定字段内容显示错误,缺少“隐患认定信息”,且只显示了最后一次认定的结果

parent 6b4a1524
...@@ -122,54 +122,55 @@ ...@@ -122,54 +122,55 @@
{{ reportOpenText }} {{ reportOpenText }}
</div> </div>
</div> </div>
<!-- {{hdConfirm}} -->
<div class="confirm-wrap" v-if="hdConfirm"> <div class="journal-wrap" v-if="hdConfirm.length > 0">
<p>隐患认定</p> <p>隐患认定</p>
<van-cell-group inset> <van-cell-group inset>
<van-row gutter=""> <van-steps direction="vertical" :active="99999">
<van-col span="7" <van-step v-for="(item, index) in hdConfirm" :key="index">
><span class="field-title">隐患整改人:</span></van-col <div class="step-wrap">
> <van-row>
<van-col span="17">{{ hdConfirm.rectificationUser }}</van-col> <van-col span="24"
</van-row> ><div class="info-title">隐患认定</div></van-col
<van-row gutter=""> >
<van-col span="7" </van-row>
><span class="field-title">隐患复查人:</span></van-col <van-row gutter="">
> <van-col span="7"
<van-col span="17">{{ hdConfirm.rectificationReview }}</van-col> ><span class="field-title">隐患整改人:</span></van-col
</van-row> >
<van-row gutter=""> <van-col span="17">{{ item.rectificationUser }}</van-col>
<van-col span="7" </van-row>
><span class="field-title">整改截止时间:</span></van-col <van-row gutter="">
> <van-col span="7"
<van-col span="17">{{ hdConfirm.endTime }}</van-col> ><span class="field-title">隐患复查人:</span></van-col
</van-row> >
<van-row gutter=""> <van-col span="17">{{ item.rectificationReview }}</van-col>
<van-col span="7"><span class="field-title">意见:</span></van-col> </van-row>
<van-col span="17">{{ hdConfirm.confirmOpinion }}</van-col> <van-row gutter="">
</van-row> <van-col span="8"
><span class="field-title">整改截止时间:</span></van-col
<!-- <div v-show="confirmOpen">hdMajorApproveList >
<van-row gutter=""> <van-col span="16">{{ item.endTime }}</van-col>
<van-col span="7" </van-row>
><span class="field-title">隐患确认信息:</span></van-col <van-row gutter="">
> <van-col span="7"
<van-col span="17">{{ hdConfirm.confirmOpinion }}</van-col> ><span class="field-title">意见:</span></van-col
</van-row> >
</div> --> <van-col span="17">{{ item.confirmOpinion }}</van-col>
</van-row>
</div>
</van-step>
</van-steps>
</van-cell-group> </van-cell-group>
<!-- <div class="more" @click="confirmReverse"> <div class="more" @click="confirmReverse">
{{ confirmOpenText }} {{ confirmOpenText }}
</div> --> </div>
</div> </div>
<div class="journal-wrap" v-if="hdMajorApproveList.length > 0"> <div class="journal-wrap" v-if="hdMajorApproveList.length > 0">
<p>审批信息</p> <p>审批信息</p>
<van-cell-group inset> <van-cell-group inset>
<van-steps <van-steps direction="vertical" :active="99999">
direction="vertical"
:active="99999"
>
<van-step v-for="(item, index) in hdMajorApproveList" :key="index"> <van-step v-for="(item, index) in hdMajorApproveList" :key="index">
<div class="step-wrap"> <div class="step-wrap">
<van-row> <van-row>
...@@ -187,7 +188,9 @@ ...@@ -187,7 +188,9 @@
<van-col span="5" <van-col span="5"
><span class="field-title">结果:</span></van-col ><span class="field-title">结果:</span></van-col
> >
<van-col span="19">{{ item.isResult == 1 ? "通过" : "退回"}}</van-col> <van-col span="19">{{
item.isResult == 1 ? "通过" : "退回"
}}</van-col>
</van-row> </van-row>
<van-row> <van-row>
<van-col span="5" <van-col span="5"
...@@ -205,22 +208,32 @@ ...@@ -205,22 +208,32 @@
<van-col span="9" <van-col span="9"
><span class="field-title">认定隐患级别:</span></van-col ><span class="field-title">认定隐患级别:</span></van-col
> >
<van-col span="10 <van-col
">{{ item.thinkHdLev }}</van-col> span="10
"
>{{ item.thinkHdLev }}</van-col
>
</van-row> </van-row>
<van-row v-if="item.details"> <van-row v-if="item.details">
<van-col span="8" <van-col span="8"
><span class="field-title">审批意见:</span></van-col ><span class="field-title">审批意见:</span></van-col
> >
<van-col span="16 <van-col
">{{ item.details }}</van-col> span="16
"
>{{ item.details }}</van-col
>
</van-row> </van-row>
</div> </div>
</van-step> </van-step>
</van-steps> </van-steps>
</van-cell-group> </van-cell-group>
<!-- 展开 --> <!-- 展开 -->
<div class="more" @click="majorReverse" v-show="hdMajorApproveList.length > 0"> <div
class="more"
@click="majorReverse"
v-show="hdMajorApproveList.length > 0"
>
{{ majorOpenText }} {{ majorOpenText }}
</div> </div>
</div> </div>
...@@ -327,7 +340,9 @@ ...@@ -327,7 +340,9 @@
<div class="step-wrap"> <div class="step-wrap">
<van-row> <van-row>
<van-col span="24" <van-col span="24"
><div class="info-title">{{item.createTime}}</div></van-col ><div class="info-title">
{{ item.createTime }}
</div></van-col
> >
</van-row> </van-row>
<van-row> <van-row>
...@@ -354,11 +369,10 @@ ...@@ -354,11 +369,10 @@
> >
<van-col span="19">{{ item.deptName }}</van-col> <van-col span="19">{{ item.deptName }}</van-col>
</van-row> </van-row>
</div> </div>
</van-step> </van-step>
</van-steps> </van-steps>
<div style="text-align: center;" v-if="hdLogList.length == 0"> <div style="text-align: center" v-if="hdLogList.length == 0">
暂无数据 暂无数据
</div> </div>
</van-cell-group> </van-cell-group>
...@@ -411,7 +425,7 @@ ...@@ -411,7 +425,7 @@
</van-step> </van-step>
</van-steps> </van-steps>
<div style="text-align: center;" v-if="instructionsList.length == 0"> <div style="text-align: center" v-if="instructionsList.length == 0">
暂无数据 暂无数据
</div> </div>
</van-cell-group> </van-cell-group>
...@@ -433,7 +447,7 @@ import LHeader from "@/components/header.vue"; ...@@ -433,7 +447,7 @@ import LHeader from "@/components/header.vue";
import { standBookDetail } from "@/service/danger"; import { standBookDetail } from "@/service/danger";
export default { export default {
components: { components: {
LHeader LHeader,
}, },
data() { data() {
return { return {
...@@ -451,7 +465,7 @@ export default { ...@@ -451,7 +465,7 @@ export default {
majorOpenText: "展开 ▼", majorOpenText: "展开 ▼",
hdReport: "", hdReport: "",
hdConfirm: "", hdConfirm: [],
hdMajorApproveList: [], // 重大隐患审批 hdMajorApproveList: [], // 重大隐患审批
beifenhdMajorList: [], beifenhdMajorList: [],
hdRectificationList: [], hdRectificationList: [],
...@@ -459,18 +473,17 @@ export default { ...@@ -459,18 +473,17 @@ export default {
hdLogList: [], hdLogList: [],
beifenhdLogList: [], beifenhdLogList: [],
instructionsList: [], instructionsList: [],
beifeninstructionsList: [] beifeninstructionsList: [],
}; };
}, },
created() { created() {
if(this.$route.params.detailTitle){ if (this.$route.params.detailTitle) {
this.text=this.$route.params.detailTitle this.text = this.$route.params.detailTitle;
} }
this.id = this.$route.params.id; this.id = this.$route.params.id;
if (this.id) { if (this.id) {
this.postDetail(); this.postDetail();
} }
}, },
methods: { methods: {
// 请求台账信息 // 请求台账信息
...@@ -479,13 +492,14 @@ export default { ...@@ -479,13 +492,14 @@ export default {
message: "加载中...", message: "加载中...",
forbidClick: true, forbidClick: true,
loadingType: "spinner", loadingType: "spinner",
duration: 0 duration: 0,
}); });
standBookDetail(`/hdreport/hdDetailsApp/${this.id}`) standBookDetail(`/hdreport/hdDetailsApp/${this.id}`)
.then(res => { .then((res) => {
this.$toast.clear(); this.$toast.clear();
this.hdReport = res.data.hdReport; this.hdReport = res.data.hdReport;
this.hdConfirm = res.data.hdConfirm; this.hdLogListAll= res.data.hdConfirm
this.hdConfirm = this.hdLogListAll.slice(-1);
this.hdRectificationList = res.data.hdRectificationList; this.hdRectificationList = res.data.hdRectificationList;
this.hdReviewList = res.data.hdReviewList; this.hdReviewList = res.data.hdReviewList;
this.beifenhdMajorList = res.data.hdMajorApproveList; this.beifenhdMajorList = res.data.hdMajorApproveList;
...@@ -513,23 +527,27 @@ export default { ...@@ -513,23 +527,27 @@ export default {
// 隐患认定显示或隐藏 // 隐患认定显示或隐藏
confirmReverse() { confirmReverse() {
this.confirmOpen = !this.confirmOpen; this.confirmOpen = !this.confirmOpen;
if (this.confirmOpen) { if (this.confirmOpen) {
// 显示所有数据
this.confirmOpenText = "收起 ▲"; this.confirmOpenText = "收起 ▲";
// 显示所有数据
this.hdConfirm = this.hdLogListAll;
} else { } else {
this.confirmOpenText = "展开 ▼"; this.confirmOpenText = "展开 ▼";
// 只显示第一个数据
this.hdConfirm = this.hdLogListAll.slice(-1);
} }
}, },
// 重大隐患信息显示或隐藏 // 重大隐患信息显示或隐藏
majorReverse() { majorReverse() {
this. majorOpen = !this. majorOpen; this.majorOpen = !this.majorOpen;
if (this. majorOpen) { if (this.majorOpen) {
// 显示所有数据 // 显示所有数据
this. majorOpenText = "收起 ▲"; this.majorOpenText = "收起 ▲";
// 显示所有数据 // 显示所有数据
this.hdMajorApproveList = this.beifenhdMajorList; this.hdMajorApproveList = this.beifenhdMajorList;
} else { } else {
this. majorOpenText = "展开 ▼"; this.majorOpenText = "展开 ▼";
// 只显示第一个数据 // 只显示第一个数据
this.hdMajorApproveList = this.beifenhdMajorList.slice(-1); this.hdMajorApproveList = this.beifenhdMajorList.slice(-1);
} }
...@@ -561,8 +579,8 @@ export default { ...@@ -561,8 +579,8 @@ export default {
this.superviseOpenText = "展开 ▼"; this.superviseOpenText = "展开 ▼";
this.instructionsList = this.beifeninstructionsList.slice(-1); this.instructionsList = this.beifeninstructionsList.slice(-1);
} }
} },
} },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment