From edcb5d7232547cb2cbb2d91ef2eaca9beda9b05d Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Thu, 01 Feb 2024 16:56:27 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 88 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index f5abb09..5a7e898 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -97,18 +97,33 @@
</div>
</template>
</el-table-column>
- <el-table-column label="项目实施天数" prop="" align="center" width="150"/>
- <el-table-column label="项目变更" prop="" align="center" width="120"/>
- <el-table-column label="预估金额（万元）" prop="" align="center" width="130"/>
- <el-table-column label="归档金额（万元）" prop="" align="center" width="130"/>
- <el-table-column label="缺失要件" align="center" width="150">
+ <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>{{scope.row.materialCnt}}</span>
+ <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="150"/>
+ <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-else></span>
+ </div>
+ </template>
+ </el-table-column>
+ <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>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template #default="scope">
<el-button link type="primary" @click="toProcess('view',scope.row)">查看</el-button>
@@ -181,7 +196,7 @@
</el-select>
</el-form-item>
<el-form-item label="缺失要件">
- <el-select v-model="search.queryParams.miss" class="m-2" size="large" placeholder="请选择" style="width: 100%" >
+ <el-select v-model="search.queryParams.params.lostMaterial" class="m-2" size="large" placeholder="请选择" style="width: 100%" >
<el-option
v-for="item in missingList"
:key="item.id"
@@ -215,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);
@@ -237,8 +253,9 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
params:{
- projectPhase: '',
+ lostMaterial: null
}
},
num: {
@@ -257,13 +274,13 @@
const estimateTypeList = ref([]);
const missingList = ref([
{
- id: 0,
- label: '否'
- },
- {
id: 1,
label: '是'
},
+ {
+ id: 0,
+ label: '否'
+ }
])
const tableRef = ref(null);
const tableHeight = ref(0);
@@ -271,6 +288,7 @@
const total = ref(0);
onMounted(() => {
+ Cookies.remove('projectId')
getList();
getStatistics();
getArea();
@@ -286,12 +304,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 => {
@@ -299,10 +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.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 : ''
}
})
- console.log('data',dataList.value)
total.value = res.data.total
loading.value = false;
}else{
@@ -310,11 +329,10 @@
}
}
const getStatistics = async () => {
- const res = await getProjectStatistics();
+ const {pageNum,pageSize, ...data} = JSON.parse(JSON.stringify(search.queryParams))
+ const res = await getProjectStatistics(data);
if(res.code == 200){
- console.log("res",res)
search.num = res.data
-
}else{
ElMessage.warning(res.message)
}
@@ -328,9 +346,9 @@
search.queryParams.pageNum = val
getList()
}
-const toProcess = (type,value) => {
+const toProcess = (type,value,toPath) => {
value.type = type;
- router.push({ path: '/process', query: {id: value.id, type: type}});
+ router.push({ path: '/process', query: {id: value.id, type: type, toPath: toPath}});
}
const getArea = async ()=>{
@@ -409,11 +427,24 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
+ params: {
+ lostMaterial: null
+ }
}
- search.queryParams.params = {}
+ chooseType.value = '';
getList();
getStatistics();
showDrawer.value = false;
+}
+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) => {
// if(state.registerForm.agency.attribute == 0){
@@ -450,13 +481,18 @@
}
}
},
- '项目实施天数': '',
+ '项目实施天数': 'filingDate',
'项目变更': '',
- '预估金额（万元）': '',
- '归档金额（万元）': '',
+ '预估金额（万元）': 'contractMoney',
+ '归档金额（万元）': 'actualContractMoney',
'缺失要件': 'materialCnt',
'归档确认': ''
});
+const goMenu = (toPath,val) => {
+ console.log("val",val)
+ toProcess('edit',val,toPath);
+}
+
</script>
--
Gitblit v1.9.2