Commit 44d5e8b3 authored by yf's avatar yf

修改显示字段

parent 9bb35e9e
...@@ -5,4 +5,4 @@ VUE_APP_TITLE = 融通物管安全管理平台 ...@@ -5,4 +5,4 @@ VUE_APP_TITLE = 融通物管安全管理平台
ENV = 'production' ENV = 'production'
# 融通物管安全管理平台/生产环境 # 融通物管安全管理平台/生产环境
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/dev-api'
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status" /> <el-table-column label="状态" align="center" prop="statusName" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
......
<template> <template>
<div class="wrapper"> <div class="wrapper">
<el-descriptions title="集团安全咨询服务项目"> <el-descriptions
<el-descriptions-item label="创建人">{{ :title="InfoList.detailsDto.name"
InfoList.createUserName class="margin-top"
}}</el-descriptions-item> :column="3"
<el-descriptions-item label="创建单位">{{ :size="size"
InfoList.detailsDto.createDeptName border
>
<el-descriptions-item label="所属项目">{{
InfoList.detailsDto.projectName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ <el-descriptions-item label="所属楼栋">{{
InfoList.detailsDto.createTime InfoList.detailsDto.buildingNames
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="所属单位">{{ <el-descriptions-item label="所属单位">{{
InfoList.createDeptId InfoList.detailsDto.deptName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="所属省市">苏州市</el-descriptions-item> <el-descriptions-item label="所属省市">苏州市</el-descriptions-item>
<el-descriptions-item label="项目坐标">{{
InfoList.workUserIds
}}</el-descriptions-item>
<el-descriptions-item label="项目负责人">{{ <el-descriptions-item label="项目负责人">{{
InfoList.detailsDto.createUserName InfoList.detailsDto.leaderUserName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="评估组成员">{{ <el-descriptions-item label="评估组成员">{{
InfoList.detailsDto.workUserNames InfoList.detailsDto.workUserNames
...@@ -26,8 +26,20 @@ ...@@ -26,8 +26,20 @@
<el-descriptions-item label="开始时间">{{ <el-descriptions-item label="开始时间">{{
InfoList.startTime InfoList.startTime
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="联系地址">{{ <el-descriptions-item label="结束时间">{{
InfoList.name InfoList.endTime
}}</el-descriptions-item>
<el-descriptions-item label="项目状态">{{
InfoList.status
}}</el-descriptions-item>
<el-descriptions-item label="创建人">{{
InfoList.createUserName
}}</el-descriptions-item>
<el-descriptions-item label="创建单位">{{
InfoList.detailsDto.createDeptName
}}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{
InfoList.detailsDto.createTime
}}</el-descriptions-item> }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
...@@ -92,7 +104,7 @@ ...@@ -92,7 +104,7 @@
> >
<el-table v-loading="loading" :data="listList"> <el-table v-loading="loading" :data="listList">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" label="序号" />
<!-- <el-table-column label="id" align="center" prop="id" /> --> <!-- <el-table-column label="id" align="center" prop="id" /> -->
<el-table-column label="风险名称" align="center" prop="name" /> <el-table-column label="风险名称" align="center" prop="name" />
<el-table-column <el-table-column
...@@ -148,22 +160,35 @@ ...@@ -148,22 +160,35 @@
<div class="approveResult"> <div class="approveResult">
<div class="approveL"> <div class="approveL">
<div class="titles">审批流程</div> <div class="titles">审批流程</div>
<el-steps direction="vertical" :active="1"> <el-steps direction="vertical" :active="999">
<el-step title="发起审批" icon="el-icon-success"></el-step>
<el-step title="评估负责人审批" icon="el-icon-success"></el-step>
<el-step title="项目负责人审批" icon="el-icon-success"></el-step>
</el-steps>
</div>
<div class="approveR">
<div class="titles">审批信息</div>
<el-steps direction="vertical" :active="1">
<el-step title="发起审批" icon="el-icon-success"></el-step>
<el-step title="评估负责人审批" icon="el-icon-success"></el-step>
<el-step <el-step
title="项目负责人审批" v-for="approveDto in InfoList.approveListDtos"
:title="approveDto.taskName"
:key="approveDto.taskId"
icon="el-icon-success" icon="el-icon-success"
description="这是一段很长很长很长的描述性文字" >
></el-step> <template slot="description">
<el-card
class="box-card"
style="line-height: 25px; font-size: 14px; margin: 15px"
>
<span style="display: block"
><b>操作时间: </b>{{ approveDto.startTime }}</span
>
<span style="display: block"
><b> 操作人:</b>{{ approveDto.approvalUserName }}</span
>
<span style="display: block"
><b>任务节点: </b>{{ approveDto.taskName }}</span
>
<span
style="display: block"
v-if="approveDto.taskOpinion != null"
><b>审批意见: </b>{{ "" + approveDto.taskOpinion }}</span
>
</el-card>
</template>
</el-step>
</el-steps> </el-steps>
</div> </div>
</div> </div>
......
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