From d1958c0d72946b04b7949eee1a28c06430a73874 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 13 Jun 2024 10:59:23 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 45470fb..275ebeb 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -69,13 +69,14 @@
<el-table v-loading="loading" :data="dataList" :border="true" ref="tableRef" :height="tableHeight" style="width: 100%;">
<el-table-column label="序号" width="80" align="center" type="index" ></el-table-column>
<el-table-column label="项目名称" prop="name" align="center" :show-overflow-tooltip="true" width="180" />
+ <el-table-column label="填报机构" prop="agencyName" align="center" :show-overflow-tooltip="true" width="180" />
<el-table-column label="委托单位" prop="client" align="center" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="所属地市" align="center" width="250">
<template #default="scope">
{{scope.row.area}}
</template>
</el-table-column>
- <el-table-column label="评价类型" prop="estimateTypeName" align="center" width="150"/>
+ <el-table-column label="类型" prop="estimateTypeName" align="center" width="150"/>
<el-table-column label="业务范围" prop="businessName" align="center" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="项目负责人" prop="leaderName" align="center" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="项目阶段" align="center" width="200">
@@ -111,7 +112,7 @@
<el-table-column label="缺失要件" align="center" width="150">
<template #default="scope">
<div style="cursor:pointer;color: #3b82f6;" >
- <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.materialCnt}}</span>
+ <span v-if="scope.row.process === 5" @click="goMenu('toTwelve',scope.row)">{{scope.row.missingMaterialCnt}}</span>
<span v-else></span>
</div>
</template>
@@ -119,7 +120,7 @@
<el-table-column label="归档确认" prop="" align="center" width="150">
<template #default="scope">
<div style="cursor:pointer;color: #3b82f6;" >
- <span @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
+ <span v-if="scope.row.process === 5" @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
<!-- <span v-else></span>-->
</div>
</template>
@@ -185,7 +186,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="评价类型">
+ <el-form-item label="类型">
<el-select v-model="search.queryParams.estimateType" class="m-2" size="large" placeholder="请选择" style="width: 100%" >
<el-option
v-for="item in estimateTypeList"
@@ -289,6 +290,8 @@
onMounted(() => {
Cookies.remove('projectId')
+ Cookies.remove('end')
+ Cookies.remove('btn')
getList();
getStatistics();
getArea();
@@ -316,11 +319,12 @@
...item,
process: item.reportProgress <= 4 ? 1 : item.reportProgress > 4 && item.reportProgress <= 6 ? 2 : item.reportProgress > 6 && item.reportProgress <= 9 ? 3 : item.reportProgress > 9 && item.reportProgress <= 11 ? 4 : 5,
leaderName: item.leader ? item.leader.name : '',
- area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city?item.province + '/' + item.city:item.province ,
+ area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city != item.province ? item.province + '/' + item.city: item.province ,
filingDate: item.filingDate ? conversionDays(item.filingDate,item.createTime) : conversionDays('',item.createTime),
contractMoney: item.contract ? item.contract.contractMoney : '',
actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
- activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: ''
+ activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: '',
+ missingMaterialCnt: 3-item.materialCnt
}
})
total.value = res.data.total
@@ -465,7 +469,7 @@
'项目名称':'name',
'委托单位':'client',
'所属地市': 'area',
- '评价类型': 'estimateTypeName',
+ '类型': 'estimateTypeName',
'业务范围': 'businessName',
'项目负责人': 'leaderName',
'项目阶段': {
@@ -492,10 +496,6 @@
});
const goMenu = (toPath,val) => {
console.log("val",val)
- if(toPath ==='toThirteen' && val.personRecognition && val.personRecognition. recognitionCnt === 0){
- ElMessage.warning('未进行签字确认，无法查看！')
- return;
- }
toProcess('edit',val,toPath);
}
--
Gitblit v1.9.2