Commit 5075ed21 authored by 罗新东's avatar 罗新东

修复了隐患确认已确认无编号的bug

parent c738eb75
Pipeline #7283 passed with stage
in 14 seconds
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
item.dueDate | formatTime item.dueDate | formatTime
}}</van-col> }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </van-row>
......
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
:key="index" :key="index"
@click="goDetail(item)" @click="goDetail(item)"
> >
{{item}}
<van-row gutter=""> <van-row gutter="">
<van-col span="6">隐患编号:</van-col> <van-col span="6">隐患编号:</van-col>
<van-col span="18">{{ item.businessId }}</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>
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
<van-col span="6">隐患类型:</van-col> <van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col> <van-col span="18">{{ item.hdType }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </van-row>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
> >
<van-row gutter=""> <van-row gutter="">
<van-col span="6">隐患编号:</van-col> <van-col span="6">隐患编号:</van-col>
<van-col span="18">{{ item.businessId }}</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>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<van-col span="6">隐患类型:</van-col> <van-col span="6">隐患类型:</van-col>
<van-col span="18">{{ item.hdType }}</van-col> <van-col span="18">{{ item.hdType }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="" v-if="item.taskName">
<van-col span="6">工单状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </van-row>
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
> >
<van-button <van-button
round round
v-if="active==0"
type="info" type="info"
@click="goConfirm(item)" @click="goConfirm(item)"
>确认</van-button >确认</van-button
...@@ -175,7 +176,7 @@ export default { ...@@ -175,7 +176,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;
......
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