From 48b9dbfb66cf8bf6c83dac0f9365ba71d3181fba Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Tue, 27 Feb 2024 15:55:41 +0800
Subject: [PATCH] bug修改增加地图搜索
---
src/views/safetyReview/projectManage/index.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 45470fb..c1fe209 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -111,7 +111,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 +119,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>
@@ -316,11 +316,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
@@ -492,10 +493,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