Commit 25b5095a authored by wanghao's avatar wanghao

1 上报时间 和 上报状态 显示调整。

parent 4abc9b9c
...@@ -106,26 +106,37 @@ ...@@ -106,26 +106,37 @@
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</el-form>
<el-col :span="12">
<el-form-item label="上报状态" > <el-divider content-position="left">上报时态</el-divider>
<span>{{fUploadType}}</span> <el-form label-width="170px">
</el-form-item> <el-row class="el-row-table">
</el-col>
<el-col :span="12">
<el-col :span="12"> <el-form-item label="上报状态" >
<el-form-item label="上报时间" > <span>{{fUploadType}}</span>
<span>{{ fUploadTime }}</span> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上报时间" >
<span>{{ fUploadTime }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
<span>{{ detailInfo.fUploadTime }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
<span>{{ detailInfo.fUploadTime }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
</template> </template>
......
<template> <template>
<el-dialog title="检查记录详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false"> <el-dialog title="检查记录详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<!-- 检查记录详情 --> <!-- 检查记录详情 -->
<InspectInfo v-if="detailOpen" :detailInfo="detailInfo"/> <InspectInfo v-if="detailOpen" :detailInfo="detailInfo"/>
<!-- 隐患管理 --> <!-- 隐患管理 -->
<Rectification :fCheckCode="detailInfo.fCheckCode" :readOnly="true" v-if="detailOpen"/> <Rectification :fCheckCode="detailInfo.fCheckCode" :readOnly="true" v-if="detailOpen"/>
<el-divider content-position="left">上报时态</el-divider>
<el-form label-width="140px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="上报时间">
<span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog> </el-dialog>
</template> </template>
......
...@@ -73,12 +73,12 @@ ...@@ -73,12 +73,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="上报时间"> <el-form-item label="上报时间">
<span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span> <span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span>
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检查单照片"> <el-form-item label="检查单照片">
......
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