From 51b377ce67ddc2aa793ded1380c52d4e9ea348b3 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Fri, 12 Jul 2024 16:47:46 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 112 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 33 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index f5abb09..94994c5 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -69,13 +69,14 @@
<el-table v-loading="loading" :data="dataList" :border="true" ref="tableRef" :height="tableHeight" style="width: 100%;">
<el-table-column label="序号" width="80" align="center" type="index" ></el-table-column>
<el-table-column label="项目名称" prop="name" align="center" :show-overflow-tooltip="true" width="180" />
+ <el-table-column label="填报机构" prop="agencyName" align="center" :show-overflow-tooltip="true" width="180" />
<el-table-column label="委托单位" prop="client" align="center" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="所属地市" align="center" width="250">
<template #default="scope">
{{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">
@@ -97,23 +98,38 @@
</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="项目实施天数" 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="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>{{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>
</el-table-column>
- <el-table-column label="归档确认" prop="" align="center" width="150"/>
+ <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)">{{scope.row.activeConfirm}}</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>
<el-button link type="primary" @click="toProcess('edit',scope.row)">编辑</el-button>
- <el-button link type="danger" @click="del(scope.row)">删除</el-button>
+ <el-button link type="danger" v-if="(isAgency && scope.row.reportProgress !== 14) || !isAgency" @click="del(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -170,7 +186,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"
@@ -181,7 +197,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 +231,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 +254,9 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
params:{
- projectPhase: '',
+ lostMaterial: null
}
},
num: {
@@ -257,20 +275,23 @@
const estimateTypeList = ref([]);
const missingList = ref([
{
- id: 0,
- label: '否'
- },
- {
id: 1,
label: '是'
},
+ {
+ id: 0,
+ label: '否'
+ }
])
const tableRef = ref(null);
const tableHeight = ref(0);
const dataList = ref([]);
const total = ref(0);
-
+const isAgency = ref(false);
onMounted(() => {
+ Cookies.remove('projectId')
+ Cookies.remove('end')
+ Cookies.remove('btn')
getList();
getStatistics();
getArea();
@@ -281,17 +302,18 @@
window.onresize = () => {
tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 170;
};
+ const userInfo = JSON.parse(Cookies.get('userInfo'))
+ isAgency.value = userInfo.identity === 1;
});
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,22 +321,27 @@
...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: '',
+ missingMaterialCnt: 3-item.materialCnt,
+ activeConfirmOut: item.personRecognition ? "\'" + item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: '',
}
})
- console.log('data',dataList.value)
total.value = res.data.total
loading.value = false;
+ console.log('11',dataList.value)
}else{
ElMessage.warning(res.message)
}
}
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 +355,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, process: value.reportProgress}});
}
const getArea = async ()=>{
@@ -373,6 +400,8 @@
if(res.code == 200){
ElMessage.success('数据删除成功')
getList()
+ getStatistics()
+
}else{
ElMessage.warning(res.message)
}
@@ -409,11 +438,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){
@@ -431,7 +473,7 @@
'项目名称':'name',
'委托单位':'client',
'所属地市': 'area',
- '评价类型': 'estimateTypeName',
+ '类型': 'estimateTypeName',
'业务范围': 'businessName',
'项目负责人': 'leaderName',
'项目阶段': {
@@ -450,13 +492,17 @@
}
}
},
- '项目实施天数': '',
- '项目变更': '',
- '预估金额（万元）': '',
- '归档金额（万元）': '',
- '缺失要件': 'materialCnt',
- '归档确认': ''
+ '项目实施天数': 'filingDate',
+ '预估金额（万元）': 'contractMoney',
+ '归档金额（万元）': 'actualContractMoney',
+ '缺失要件': 'missingMaterialCnt',
+ '归档确认': 'activeConfirmOut'
});
+const goMenu = (toPath,val) => {
+ console.log("val",val)
+ toProcess('edit',val,toPath);
+}
+
</script>
--
Gitblit v1.9.2