From ea55fc721eae712a4e7d103ba9cc569518f096f1 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 14 六月 2024 09:35:14 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/evaluatePlan.vue | 7 ++++++-
src/views/safetyReview/projectSupplement/index.vue | 1 +
src/views/safetyReview/projectManage/index.vue | 6 ++++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/evaluatePlan.vue b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
index b376069..378932d 100644
--- a/src/views/safetyReview/projectManage/components/evaluatePlan.vue
+++ b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
@@ -86,7 +86,12 @@
</el-row>
<el-table :data="state.planPersons" :border="true" style="margin: 20px 0">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
- <el-table-column label="评价组成员" prop="person.name" align="center" :show-overflow-tooltip="true"/>
+ <el-table-column label="评价组成员" prop="person.name" align="center" :show-overflow-tooltip="true">
+ <template #default="scope">
+ <span v-if="scope.row.jobType === 2">{{ scope.row.person.name }} (组长)</span>
+ <span v-else>{{scope.row.person.name}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="专业能力/资格证书" prop="person.certificateNo" align="center" :show-overflow-tooltip="true">
<template #default="scope">
{{ getCertNo(scope.row) }}
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 275ebeb..b58a644 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -129,7 +129,7 @@
<template #default="scope">
<el-button link type="primary" @click="toProcess('view',scope.row)">查看</el-button>
<el-button link type="primary" @click="toProcess('edit',scope.row)">编辑</el-button>
- <el-button link type="danger" @click="del(scope.row)">删除</el-button>
+ <el-button link type="danger" v-if="(isAgency && scope.row.reportProgress !== 14) || !isAgency" @click="del(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -287,7 +287,7 @@
const tableHeight = ref(0);
const dataList = ref([]);
const total = ref(0);
-
+const isAgency = ref(false);
onMounted(() => {
Cookies.remove('projectId')
Cookies.remove('end')
@@ -302,6 +302,8 @@
window.onresize = () => {
tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 170;
};
+ const userInfo = JSON.parse(Cookies.get('userInfo'))
+ isAgency.value = userInfo.identity === 1;
});
const chooseType = ref('');
diff --git a/src/views/safetyReview/projectSupplement/index.vue b/src/views/safetyReview/projectSupplement/index.vue
index 6d86d07..e73835b 100644
--- a/src/views/safetyReview/projectSupplement/index.vue
+++ b/src/views/safetyReview/projectSupplement/index.vue
@@ -14,6 +14,7 @@
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column label="项目名称" prop="name" align="center" width="180" />
<el-table-column label="项目时间" prop="filingDate" align="center" :show-overflow-tooltip="true" />
+ <el-table-column label="所属机构" prop="agencyName" align="center" :show-overflow-tooltip="true" />
<el-table-column label="报告撰写人" prop="writer" align="center" :show-overflow-tooltip="true" />
<el-table-column label="报告审批人" prop="reviewer" align="center" width="200" />
<el-table-column label="报告扫描件" align="center" >
--
Gitblit v1.9.2