From 68cd58de3a45d79ea241fa4d79e550217072e494 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Fri, 15 Mar 2024 15:09:19 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
index 4d99800..2b3782d 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
@@ -60,7 +60,7 @@
<el-table-column label="归档确认" prop="" align="center" width="150">
<template #default="scope">
<div style="cursor:pointer;color: #3b82f6;" >
- <span v-if="scope.row.process === 5 && scope.row.personRecognition" @click="goMenu('toThirteen',scope.row)">{{scope.row.personRecognition.recognitionCnt}}/{{scope.row.personRecognition.personCnt}}</span>
+ <span v-if="scope.row.process === 5" @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
<span v-else></span>
</div>
</template>
@@ -125,10 +125,11 @@
...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 ? item.filingDate : conversionDays(item.createTime),
contractMoney: item.contract ? item.contract.contractMoney : '',
actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+ activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: '',
missingMaterialCnt: 3-item.materialCnt
}
})
@@ -157,10 +158,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);
}
const conversionDays = (createTime) => {
--
Gitblit v1.9.2