From 32025887cb0e13634d800330bb33e3533fd3f70d Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期四, 22 二月 2024 17:01:12 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 5a7e898..7cc3172 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -98,20 +98,20 @@
</template>
</el-table-column>
<el-table-column label="项目实施天数" prop="filingDate" align="center" width="150"/>
- <el-table-column label="项目变更" prop="" align="center" width="120">
- <template #default="scope">
- <div style="cursor:pointer;color: #3b82f6;" >
- <span v-if="scope.row.process !== 1" @click="goMenu('toFive',scope.row)">{{}}</span>
- <span v-else></span>
- </div>
- </template>
- </el-table-column>
+<!-- <el-table-column label="项目变更" prop="" align="center" width="120">-->
+<!-- <template #default="scope">-->
+<!-- <div style="cursor:pointer;color: #3b82f6;" >-->
+<!-- <span v-if="scope.row.process !== 1" @click="goMenu('toFive',scope.row)">{{}}</span>-->
+<!-- <span v-else></span>-->
+<!-- </div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column label="预估金额（万元）" prop="contractMoney" align="center" width="130"/>
<el-table-column label="归档金额（万元）" prop="actualContractMoney" align="center" width="130"/>
<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,8 +119,8 @@
<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" @click="goMenu('toThirteen',scope.row)">{{}}</span>
- <span v-else></span>
+ <span @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
+<!-- <span v-else></span>-->
</div>
</template>
</el-table-column>
@@ -319,7 +319,9 @@
area: item.district ? item.province + '/' + item.city + '/' + item.district : item.city?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 : ''
+ actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+ activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: '',
+ missingMaterialCnt: 3-item.materialCnt
}
})
total.value = res.data.total
@@ -348,7 +350,7 @@
}
const toProcess = (type,value,toPath) => {
value.type = type;
- router.push({ path: '/process', query: {id: value.id, type: type, toPath: toPath}});
+ router.push({ path: '/process', query: {id: value.id, type: type, toPath: toPath, process: value.reportProgress}});
}
const getArea = async ()=>{
@@ -391,6 +393,8 @@
if(res.code == 200){
ElMessage.success('数据删除成功')
getList()
+ getStatistics()
+
}else{
ElMessage.warning(res.message)
}
@@ -482,14 +486,17 @@
}
},
'项目实施天数': 'filingDate',
- '项目变更': '',
'预估金额（万元）': 'contractMoney',
'归档金额（万元）': 'actualContractMoney',
'缺失要件': 'materialCnt',
- '归档确认': ''
+ '归档确认': 'activeConfirm'
});
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