From 8d14fec97344df49d58db115852c03b466482bc6 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期三, 12 四月 2023 14:47:21 +0800 Subject: [PATCH] 设备、场所、部门接口 --- src/views/experiment/project/index.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/views/experiment/project/index.vue b/src/views/experiment/project/index.vue index 041467f..74c5922 100644 --- a/src/views/experiment/project/index.vue +++ b/src/views/experiment/project/index.vue @@ -22,7 +22,7 @@ <div class="main-card"> <el-row class="cardTop"> <el-col :span="12" class="mainCardBtn"> - <el-button type="primary" :icon="Plus" size="default" @click="openProjectDialog('新增', {})">新增</el-button> + <el-button type="primary" :icon="Plus" size="default" @click="openProjectDialog('新增', {})">录入实验信息</el-button> <!-- <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>--> </el-col> <!-- <el-button type="primary" :icon="Refresh" size="default" />--> @@ -30,16 +30,60 @@ <el-table ref="multipleTableRef" :data="projectState.projectData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }"> <el-table-column prop="experimentCode" label="实验编号"/> <el-table-column prop="experimentName" label="实验名称"/> - <el-table-column prop="expectStartTime" label="立项时间" /> + <el-table-column prop="createExperimentTime" label="立项时间" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.createExperimentTime?scope.row.createExperimentTime.substring(0,16):'--'}}</span> + </template> + </el-table-column> +<!-- <el-table-column prop="startTime" label="开展时间" show-overflow-tooltip>--> +<!-- <template #default="scope">--> +<!-- <span>{{scope.row.startTime?scope.row.startTime.substring(0,16):'--'}}</span>--> +<!-- </template>--> +<!-- </el-table-column>--> <el-table-column prop="liabilityUser" label="负责人"/> - <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column> - <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column> - <el-table-column prop="updateTime" label="最后修改时间" show-overflow-tooltip></el-table-column> - <el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column> - <el-table-column label="操作" width="250"> + <el-table-column prop="siteList" label="实验场所" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.siteList.map(i=>i.siteName).join(',')}}</span> + </template> + </el-table-column> + <el-table-column prop="experimentType" label="实验类别"> + <template #default="scope"> + <span>{{projectState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</span> + </template> + </el-table-column> + <el-table-column prop="status" label="评估申请"> + <template #default="scope"> + <span>{{scope.row.status == 1?'未申请':scope.row.status == 2?'已申请':'--'}}</span> + </template> + </el-table-column> + <el-table-column prop="status" label="评估申请时间" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.assessApplyTime?scope.row.assessApplyTime.substring(0,16):'--'}}</span> + </template> + </el-table-column> + <el-table-column prop="stage" label="评估状态"> + <template #default="scope"> + <el-tag :type="scope.row.stage == 4?'success':scope.row.stage == 1?'info':''"> + {{scope.row.stage == 1?'未评估':scope.row.status == 2?'评估中':scope.row.status == 3?'评估完成':scope.row.status == 4?'生成报告':'--'}} + </el-tag> + </template> + </el-table-column> + <el-table-column prop="assessLevel" label="风险等级"> + <template #default="scope"> + <el-tag :type="scope.row.assessLevel == 4?'danger':scope.row.assessLevel == 3 || scope.row.assessLevel == 2?'warning':''"> + {{scope.row.assessLevel == 1?'低风险':scope.row.assessLevel == 2?'一般风险':scope.row.assessLevel == 3?'较大风险':scope.row.assessLevel == 4?'重大风险':'--'}} + </el-tag> + </template> + </el-table-column> +<!-- <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>--> +<!-- <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>--> +<!-- <el-table-column prop="updateTime" label="最后修改时间" show-overflow-tooltip></el-table-column>--> +<!-- <el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column>--> + <el-table-column label="操作" width="250" fixed="right"> <template #default="scope"> <el-button size="small" text type="primary" :icon="View" @click="openProjectDialog('查看', scope.row)">查看</el-button> <el-button size="small" text type="primary" :icon="Edit" @click="applyStart('申请开展', scope.row)">申请开展</el-button> + <el-button size="small" type="warning" v-if="scope.row.rectifyStatus == 1" text :icon="Edit" @click="openProjectDialog('整改', scope.row)">整改</el-button> <el-button size="small" text type="danger" :icon="Delete" @click="onDelProject(scope.row)">删除</el-button> </template> </el-table-column> @@ -113,7 +157,7 @@ }; const onDelProject = (val: ProjectType) => { - ElMessageBox.confirm(`此操作将永久删除该实验:“${val.experimentCode}”,是否继续?`, '提示', { + ElMessageBox.confirm(`此操作将永久删除该实验:“${val.experimentName}”,是否继续?`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' -- Gitblit v1.9.2