Commit 1b5aef7e authored by 陈晓晋's avatar 陈晓晋

任务详情和任务相关权限20230807

parent e1af9b91
This diff is collapsed.
......@@ -57,7 +57,7 @@
<div class="approveResult">
<div class="approveL">
<span style="font-weight: bold;">技术措施</span>
<p>{{InfoList.measuresProject}}</p>
<p>{{InfoList.measuresProject==null?"暂无":InfoList.measuresProject}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">技术措施附件</span>
<p>
......@@ -76,7 +76,7 @@
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施</span>
<p>{{InfoList.measuresAdministration}}</p>
<p>{{InfoList.measuresAdministration==null?"暂无":InfoList.measuresAdministration}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施附件</span>
......@@ -96,10 +96,10 @@
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施</span>
<p>{{InfoList.measuresEmergency}}</p>
<p>{{InfoList.measuresEmergency==null?"暂无":InfoList.measuresEmergency}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施附件</span>
<p>
<template>
<div v-if="InfoList.measuresEmergencyFile!=null">
......@@ -115,15 +115,15 @@
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任单位:</span><span>{{InfoList.measuresDeptName}}</span>
<span style="font-weight: bold;">管控责任单位:</span><span style="padding-left:30px;">{{InfoList.measuresDeptName==null?"暂无":InfoList.measuresDeptName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人:</span><span>{{InfoList.measuresUserName}}</span>
<span style="font-weight: bold;">管控责任人:</span><span style="padding-left:30px;">{{InfoList.measuresUserName==null?"暂无":InfoList.measuresUserName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人联系方式:</span><span>{{InfoList.measuresUserPhone}}</span>
<span style="font-weight: bold;">管控责任人联系方式:</span><span style="padding-left:30px;">{{InfoList.measuresUserPhone==null?"暂无":InfoList.measuresUserPhone}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">判断依据:</span><span>{{InfoList.referenceBasis}}</span>
<span style="font-weight: bold;">判断依据:</span><span style="padding-left:30px;">{{InfoList.referenceBasis==null?"暂无":InfoList.referenceBasis}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">风险等级:</span><span>{{InfoList.level}}</span>
<span style="font-weight: bold;">风险等级:</span><span style="padding-left:30px;">{{InfoList.level==null?"暂无":InfoList.level}}</span>
</div>
</div>
......
......@@ -59,15 +59,15 @@
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:riskPlan:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:riskPlan:export']">导出</el-button>
</el-col>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" />
<el-table-column type="selection" align="center" :selectable="checkSelect" />
<el-table-column label="序号" align="center" >
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
......@@ -89,8 +89,8 @@
</el-popover>
</template>
</el-table-column>
<!-- <el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" /> -->
<el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员" align="center" prop="workUserNames" width="120"/>
<el-table-column label="开始时间" align="center" prop="startTime" width="120" >
......@@ -117,11 +117,15 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<!-- <div v-if="scope.row.statusName=='任务待执行'">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:riskPlan:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:riskPlan:remove']">删除</el-button>
</div> -->
<router-link :to="'/risk/plan/ledgerdata/index/' + scope.row.id" class="link-type">
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
</router-link>
</template>
</el-table-column>
......@@ -370,6 +374,12 @@
},
methods: {
/**
* 判断select是否可选
*/
checkSelect(row) {
return row.statusName=='任务待执行'
},
getUserListByDeptId(deptId) {
getUserListByDeptId(deptId).then(response => {
......
......@@ -66,7 +66,7 @@
<div class="approveResult">
<div class="approveL">
<span style="font-weight: bold;">技术措施</span>
<p>{{InfoList.measuresProject}}</p>
<p>{{InfoList.measuresProject==null?"暂无":InfoList.measuresProject}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">技术措施附件</span>
<p>
......@@ -85,7 +85,7 @@
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施</span>
<p>{{InfoList.measuresAdministration}}</p>
<p>{{InfoList.measuresAdministration==null?"暂无":InfoList.measuresAdministration}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管理措施附件</span>
<p>
......@@ -104,7 +104,7 @@
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施</span>
<p>{{InfoList.measuresEmergency}}</p>
<p>{{InfoList.measuresEmergency==null?"暂无":InfoList.measuresEmergency}}</p>
<el-divider></el-divider>
<span style="font-weight: bold;">应急措施附件</span>
<p>
......@@ -122,11 +122,11 @@
</template>
</p>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任单位:</span><span>{{InfoList.measuresDeptName}}</span>
<span style="font-weight: bold;">管控责任单位:</span><span>{{InfoList.measuresDeptName==null?"暂无":InfoList.measuresDeptName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人:</span><span>{{InfoList.measuresUserName}}</span>
<span style="font-weight: bold;">管控责任人:</span><span>{{InfoList.measuresUserName==null?"暂无":InfoList.measuresUserName}}</span>
<el-divider></el-divider>
<span style="font-weight: bold;">管控责任人联系方式:</span><span>{{InfoList.measuresUserPhone}}</span>
<span style="font-weight: bold;">管控责任人联系方式:</span><span>{{InfoList.measuresUserPhone==null?"暂无":InfoList.measuresUserPhone}}</span>
</div>
</div>
......@@ -172,10 +172,10 @@
<el-table-column label="操作" align="center" prop="describe">
<template slot-scope="scope">
<div>
<el-button size="mini" type="text" icon="el-icon-download"
<!-- <el-button size="mini" type="text" icon="el-icon-download"
@click="exportList(scope.row.id)">下载风险告知卡</el-button>
<el-button size="mini" type="text" icon="el-icon-view"
@click="showDrawCanvas(scope.row.floorId)">查看四色图</el-button>
@click="showDrawCanvas(scope.row.floorId)">查看四色图</el-button> -->
<router-link :to="'/risk/plan/existingdata/index/' + scope.row.id" class="link-type">
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
</router-link>
......
......@@ -47,7 +47,18 @@
<span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="statusName" />
<el-table-column label="状态" align="center" prop="statusName" >
<template slot-scope="scope">
<div>
<div v-if="scope.row.statusName=='项目完成'"><el-tag type="info">项目完成</el-tag></div>
<div v-else-if="scope.row.statusName=='审批任务'"><el-tag >审批任务</el-tag></div>
<div v-else-if="scope.row.statusName=='任务待执行'"><el-tag type="warning">任务待执行</el-tag></div>
<div v-else-if="scope.row.statusName=='验收任务'"><el-tag type="success">验收任务</el-tag></div>
<div v-else><el-tag type="danger">{{scope.row.statusName}}</el-tag></div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/risk/plan/ledgerdata/index/' + scope.row.id" class="link-type">
......@@ -97,6 +108,7 @@
pageSize: 10,
name: null,
no: null,
isLedger:"ledger",
projectId: null,
buildingIds: null,
createUserId: null,
......
......@@ -10,9 +10,14 @@
<el-descriptions-item label="所属项目">{{
InfoList.detailsDto.projectName
}}</el-descriptions-item>
<el-descriptions-item label="所属楼栋">{{
InfoList.detailsDto.buildingNames
}}</el-descriptions-item>
<el-descriptions-item label="所属楼栋" >
<!-- {{InfoList.detailsDto.buildingNames}} -->
<template>
<div v-for="(buildingName, index) in InfoList.detailsDto.buildingNames.split(',')" :key="index">
{{buildingName}}
</div>
</template>
</el-descriptions-item>
<el-descriptions-item label="所属单位">{{
InfoList.detailsDto.deptName
}}</el-descriptions-item>
......@@ -134,7 +139,7 @@
<router-link :to="'/risk/plan/inherentdata/index/' + scope.row.id" class="link-type">
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
</router-link>
</div>
</template>
</el-table-column>
......
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