Commit 29d4d99e authored by 罗新东's avatar 罗新东

添加了隐患标签页面,修改了页面某些字段。

parent 269c15a5
Pipeline #7269 passed with stage
in 27 seconds
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
inset inset
v-for="(item, index) in messageList" v-for="(item, index) in messageList"
:key="index" :key="index"
@click="goDetail(item.taskId)" @click="goDetail(item)"
> >
<van-row gutter=""> <van-row gutter="">
<van-col span="6">隐患编号:</van-col> <van-col span="6">隐患编号:</van-col>
...@@ -312,11 +312,11 @@ export default { ...@@ -312,11 +312,11 @@ export default {
this.showPickerReview = false; this.showPickerReview = false;
}, },
// 详情 // 详情
goDetail(taskId) { goDetail(data) {
this.$router.push({ this.$router.push({
name: "normal-detail", name: "normal-detail",
params: { params: {
id: taskId, id: data.taskId||data.id,
}, },
}); });
}, },
......
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
postFun(this.tabs[this.active]['api'], formdata) postFun(this.tabs[this.active]['api'], formdata)
.then((res) => { .then((res) => {
this.$toast.clear(); this.$toast.clear();
this.messageList = res.rows; this.messageList = res.data||res.rows;
// 判断有无数据返回 // 判断有无数据返回
if (this.messageList.length == 0) { if (this.messageList.length == 0) {
this.isHaveNews = true; this.isHaveNews = true;
......
...@@ -51,15 +51,24 @@ ...@@ -51,15 +51,24 @@
<van-row gutter=""> <van-row gutter="">
<van-col span="6">隐患级别:</van-col> <van-col span="6">隐患级别:</van-col>
<van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">是否通过:</van-col>
<van-col span="17">{{ item.examineResult }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="6">意见:</van-col>
<van-col span="18">{{ item.examineReason }}</van-col>
</van-row> </van-row>
<!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
<template v-if="active == 0"> <template>
<van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop="showIndex = null"> <div class="wrapper" @click.stop="showIndex = null">
<!-- <van-button round type="primary" @click="goDetail(item)" <van-button round type="primary" @click="goDetail(item)"
>详情</van-button >详情</van-button
> --> >
<van-button round type="info" @click="goConfirm(item)" <van-button round type="info" @click="goConfirm(item)"
v-if="active == 0"
>审批 >审批
</van-button> </van-button>
</div> </div>
...@@ -144,15 +153,15 @@ export default { ...@@ -144,15 +153,15 @@ export default {
}, },
// 详情 // 详情
// goDetail(data) { goDetail(data) {
// this.$router.push({ this.$router.push({
// name: "normal-detail", name: "normal-detail",
// params: { params: {
// id: data.businessId, id: data.businessId,
// }, },
// }); });
// this.showIndex = null; this.showIndex = null;
// }, },
// 审批 // 审批
goConfirm(data) { goConfirm(data) {
this.$router.push({ this.$router.push({
......
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
this.$router.push({ this.$router.push({
name: "normal-detail", name: "normal-detail",
params: { params: {
id: data.taskId, id: data.taskId||data.id,
}, },
}); });
this.showIndex = null; this.showIndex = null;
......
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
// name: "insert-danger-detail", // name: "insert-danger-detail",
name: "risk-big-detail", name: "risk-big-detail",
params: { params: {
id: data.processinstanceId, id: data.id,
}, },
}); });
this.showIndex = null; this.showIndex = null;
......
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
> >
<van-row gutter=""> <van-row gutter="">
<van-col span="6">风险编号:</van-col> <van-col span="6">风险编号:</van-col>
<van-col span="18">{{ item[['businessId','id'][active]] }}</van-col> <van-col span="18">{{ item['businessId']||item['id']}}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">所属项目:</van-col> <van-col span="6">所属项目:</van-col>
<van-col span="18">{{ item[['proId','pId'][active]] }}</van-col> <van-col span="18">{{item['proId']||item['pId']}}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">风险级别:</van-col> <van-col span="6">风险级别:</van-col>
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
postFun(this.tabs[this.active]['api'], formdata) postFun(this.tabs[this.active]['api'], formdata)
.then((res) => { .then((res) => {
this.$toast.clear(); this.$toast.clear();
this.messageList = res.rows; this.messageList =res.data||res.rows;
// 判断有无数据返回 // 判断有无数据返回
if (this.messageList.length == 0) { if (this.messageList.length == 0) {
this.isHaveNews = true; this.isHaveNews = true;
......
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