From 42235ae8c08bcc09bb53a3631f988e74a0920db4 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 16 四月 2024 08:41:35 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 10ca670..fff085e 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -75,7 +75,7 @@
{{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">
@@ -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 v-if="scope.row.process === 5" @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
+<!-- <span v-else></span>-->
</div>
</template>
</el-table-column>
@@ -185,7 +185,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"
@@ -230,6 +230,7 @@
import {getRegionTree} from "@/api/area";
import {getDict} from "@/api/login";
import {getDictList} from "@/api/backManage/evaluate";
+import Cookies from "js-cookie"
const router = useRouter();
const loading = ref(false);
@@ -252,8 +253,8 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
params:{
- projectPhase: '',
lostMaterial: null
}
},
@@ -287,6 +288,9 @@
const total = ref(0);
onMounted(() => {
+ Cookies.remove('projectId')
+ Cookies.remove('end')
+ Cookies.remove('btn')
getList();
getStatistics();
getArea();
@@ -302,12 +306,11 @@
const chooseType = ref('');
const choose = (val) => {
chooseType.value = val;
- search.queryParams.params.projectPhase = val;
+ search.queryParams.phase = val;
getList();
}
const getList = async () => {
loading.value = true;
- console.log(search.queryParams,'search.queryParams')
const res = await getProjectList(search.queryParams);
if(res.code == 200){
dataList.value = res.data.list.map(item => {
@@ -315,10 +318,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 ,
- filingDate: item.filingDate ? item.filingDate : conversionDays(item.createTime),
+ 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 : ''
+ actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+ activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: '',
+ missingMaterialCnt: 3-item.materialCnt
}
})
total.value = res.data.total
@@ -329,12 +334,9 @@
}
const getStatistics = async () => {
const {pageNum,pageSize, ...data} = JSON.parse(JSON.stringify(search.queryParams))
- console.log("data",data)
const res = await getProjectStatistics(data);
if(res.code == 200){
- console.log("res统计",res)
search.num = res.data
-
}else{
ElMessage.warning(res.message)
}
@@ -350,7 +352,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 ()=>{
@@ -393,6 +395,8 @@
if(res.code == 200){
ElMessage.success('数据删除成功')
getList()
+ getStatistics()
+
}else{
ElMessage.warning(res.message)
}
@@ -429,14 +433,23 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
+ params: {
+ lostMaterial: null
+ }
}
- search.queryParams.params = {}
+ chooseType.value = '';
getList();
getStatistics();
showDrawer.value = false;
}
-const conversionDays = (createTime) => {
- let day = Date.now() - new Date(createTime).getTime();//日期转时间戳
+const conversionDays = (time,createTime) => {
+ let day = "";
+ if(time) {
+ day = new Date(time).getTime() - new Date(createTime).getTime();//日期转时间戳
+ }else {
+ day = Date.now() - new Date(createTime).getTime();//日期转时间戳
+ }
return Math.floor(day / 86400000) ;//时间戳获取天数
}
const handleChange = (value) => {
@@ -455,7 +468,7 @@
'项目名称':'name',
'委托单位':'client',
'所属地市': 'area',
- '评价类型': 'estimateTypeName',
+ '类型': 'estimateTypeName',
'业务范围': 'businessName',
'项目负责人': 'leaderName',
'项目阶段': {
@@ -475,11 +488,10 @@
}
},
'项目实施天数': 'filingDate',
- '项目变更': '',
'预估金额（万元）': 'contractMoney',
'归档金额（万元）': 'actualContractMoney',
'缺失要件': 'materialCnt',
- '归档确认': ''
+ '归档确认': 'activeConfirm'
});
const goMenu = (toPath,val) => {
console.log("val",val)
--
Gitblit v1.9.2