From 137910cf4fc73a3a2787a3a02718f1e1f637c368 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 14 六月 2024 16:01:17 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 381 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 352 insertions(+), 29 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 1a9a477..94994c5 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -2,17 +2,24 @@
<div class="project-container">
<div class="header">
<el-button type="success" icon="Plus" @click="toProcess('add',{})">新增</el-button>
- <el-button type="warning" >导出</el-button>
- <el-button type="primary" icon="Filter">筛选</el-button>
+ <vue3-json-excel
+ :json-data="dataList"
+ :fields="fields"
+ name="项目信息表.xlsx"
+ style="margin-right: 5px;margin-left: 5px"
+ >
+ <el-button type="warning">导出</el-button>
+ </vue3-json-excel>
+ <el-button type="primary" icon="Filter" @click="showDrawer = true">筛选</el-button>
</div>
<div class="middle">
<div class="card-box">
<div class="box-left" @click="choose('')">
- <class class="font-left">
+ <div class="font-left">
<div>项目</div>
<div>总数</div>
- </class>
- <class class="font-right">{{search.num.projectTotal}}</class>
+ </div>
+ <div class="font-right">{{search.num.projectTotal}}</div>
</div>
<div class="box-right">
<div class="inbox" @click="choose(1)" style="box-shadow: rgba(132, 122, 253, 0.2) 0 3px 5px 0;" :class="{btn1: chooseType === 1}">
@@ -62,31 +69,67 @@
<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="所属地市" prop="updateTime" align="center" width="250">
+ <el-table-column label="所属地市" align="center" width="250">
<template #default="scope">
- {{scope.row.province}}/{{scope.row.city}}
+ {{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="" align="center" width="120" :show-overflow-tooltip="true"/>
- <el-table-column label="项目阶段" prop="" align="center" width="200">
+ <el-table-column label="项目负责人" prop="leaderName" align="center" width="120" :show-overflow-tooltip="true"/>
+ <el-table-column label="项目阶段" align="center" width="200">
<template #default="scope">
-
+ <div v-if="scope.row.process === 1" class="process1">
+ <span>风险分析及计划评价</span>
+ </div>
+ <div v-else-if="scope.row.process === 2" class="process1 process2">
+ <span>现场勘验</span>
+ </div>
+ <div v-else-if="scope.row.process === 3" class="process1 process3">
+ <span>项目审核</span>
+ </div>
+ <div v-else-if="scope.row.process === 4" class="process1 process4">
+ <span>出具报告</span>
+ </div>
+ <div v-else class="process1 process5">
+ <span>项目归档</span>
+ </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="" align="center" width="150"/>
- <el-table-column label="归档确认" prop="" 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 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.missingMaterialCnt}}</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)">{{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>
@@ -102,6 +145,81 @@
@current-change="handleCurrentChange"
/>
</div>
+ <el-drawer v-model="showDrawer" :direction="direction" :with-header="false" :size="size" >
+ <template #default>
+ <div class="drawer">
+ <el-form ref="drawerRef" class="register-form" label-position="top">
+ <el-form-item label="时间选择">
+ <el-date-picker
+ v-model="searchTime"
+ type="daterange"
+ @change="changeTime"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+ <el-form-item label="所属区域">
+ <el-cascader
+ v-model="area"
+ :options="addressList"
+ :props="props"
+ @change="handleChange"
+ style="width: 100%"
+ size="large"
+ />
+ </el-form-item>
+ <el-form-item label="项目名称" >
+ <el-input v-model="search.queryParams.name" placeholder="请输入项目名称"></el-input>
+ </el-form-item>
+ <el-form-item label="委托单位">
+ <el-input v-model="search.queryParams.client" placeholder="委托单位"></el-input>
+ </el-form-item>
+ <el-form-item label="业务范围">
+ <el-select v-model="search.queryParams.business" class="m-2" size="large" placeholder="请选择" style="width: 100%" >
+ <el-option
+ v-for="item in businessList"
+ :key="item.id"
+ :label="item.label"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ <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"
+ :key="item.id"
+ :label="item.label"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缺失要件">
+ <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"
+ :label="item.label"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+
+ </el-form>
+ </div>
+ </template>
+ <template #footer>
+ <div style="flex: auto">
+ <el-button type="primary" @click="searchClick">查询</el-button>
+ <el-button type="warning" @click="reset">重置</el-button>
+ <el-button @click="confirmClick">取消</el-button>
+
+ </div>
+ </template>
+ </el-drawer>
+
</div>
</template>
@@ -110,16 +228,35 @@
import {onMounted, reactive, ref} from "vue";
import {delProject, getProjectList, getProjectStatistics} from "@/api/projectManage/project";
import {ElMessage, ElMessageBox} from "element-plus";
-import {delMonitor} from "@/api/sysUsers";
+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);
+const direction = ref('rtl');
+const showDrawer = ref(false);
+const size = ref('400px')
+const props = {
+ expandTrigger: 'hover',
+ value: 'name',
+ label: 'name'
+}
const search = reactive({
queryParams: {
pageNum: 1,
pageSize: 20,
+ name: '',
+ client: '',
+ province: '',
+ city: '',
+ district: '',
+ business: '',
+ estimateType: '',
+ phase: '',
params:{
- projectPhase: '',
+ lostMaterial: null
}
},
num: {
@@ -131,50 +268,86 @@
archiveTotal: 0
}
});
+const searchTime = ref([]);
+const area = ref([]);
+const businessList = ref([]);
+const addressList = ref([]);
+const estimateTypeList = ref([]);
+const missingList = ref([
+ {
+ 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();
+ getBusinessList();
+ getRiskList();
tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 170;
// 监听浏览器高度变化
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;
+ dataList.value = res.data.list.map(item => {
+ return {
+ ...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.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: '',
+ }
+ })
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)
}
}
const handleSizeChange = (val) => {
+ search.queryParams.pageNum = 1;
search.queryParams.pageSize = val
getList()
}
@@ -182,10 +355,37 @@
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 ()=>{
+ const type = 1
+ const res = await getRegionTree({name: '',parentId: null,regionType: type})
+ if(res.code == 200){
+ addressList.value = res.data
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+const getBusinessList = async () => {
+ const res = await getDict({dictType: 'sys_business_scope'})
+ if(res.code === 200){
+ businessList.value = res.data
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+const getRiskList = async () => {
+ const res = await getDictList({dictType: "sys_assess_type"});
+ if(res.code === 200){
+ estimateTypeList.value = res.data.list
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+
const del = (val) => {
ElMessageBox.confirm(
'确定删除此条数据？',
@@ -200,11 +400,110 @@
if(res.code == 200){
ElMessage.success('数据删除成功')
getList()
+ getStatistics()
+
}else{
ElMessage.warning(res.message)
}
})
}
+const confirmClick = () => {
+ showDrawer.value = false;
+}
+const changeTime=(value)=>{
+ if(!value){
+ search.queryParams.params.endTime = ""
+ search.queryParams.params.startTime = ""
+ }
+}
+const searchClick = () => {
+ if(searchTime.value && searchTime.value.length>0){
+ search.queryParams.params.startTime = searchTime.value[0]
+ search.queryParams.params.endTime = searchTime.value[1]
+ }
+ getList();
+ getStatistics();
+ showDrawer.value = false;
+}
+const reset = () => {
+ searchTime.value = [];
+ area.value = [];
+ search.queryParams = {
+ pageNum: 1,
+ pageSize: 20,
+ name: '',
+ client: '',
+ province: '',
+ city: '',
+ district: '',
+ business: '',
+ estimateType: '',
+ phase: '',
+ params: {
+ lostMaterial: null
+ }
+ }
+ 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){
+ // state.registerForm.agency.province = '新疆维吾尔自治区'
+ // state.registerForm.agency.city = value[0]?value[0]:''
+ // state.registerForm.agency.district = value[1]?value[1]:''
+ // }else{
+ search.queryParams.province = value[0]?value[0]:''
+ search.queryParams.city = value[1]?value[1]:''
+ search.queryParams.district = value[2]?value[2]:''
+ // }
+}
+// 导出表格
+const fields = ref({
+ '项目名称':'name',
+ '委托单位':'client',
+ '所属地市': 'area',
+ '类型': 'estimateTypeName',
+ '业务范围': 'businessName',
+ '项目负责人': 'leaderName',
+ '项目阶段': {
+ field: 'process',
+ callback: (value) => {
+ if (value === 1) {
+ return '风险分析及计划评价'
+ } else if(value === 2){
+ return '现场勘验'
+ }else if(value === 3){
+ return '项目审核'
+ }else if(value === 4){
+ return '出具报告'
+ }else if(value === 5){
+ return '项目归档'
+ }
+ }
+ },
+ '项目实施天数': 'filingDate',
+ '预估金额（万元）': 'contractMoney',
+ '归档金额（万元）': 'actualContractMoney',
+ '缺失要件': 'missingMaterialCnt',
+ '归档确认': 'activeConfirmOut'
+});
+const goMenu = (toPath,val) => {
+ console.log("val",val)
+ toProcess('edit',val,toPath);
+}
+
+
</script>
<style scoped lang="scss">
@@ -334,5 +633,29 @@
float: right;
margin-top: 20px;
}
+ .process1{
+ border-radius: 5px;
+ color: rgb(255, 255, 255);
+ padding: 5px 10px;
+ background: linear-gradient(90deg, rgb(127, 118, 253), rgb(218, 180, 246));
+ }
+ .process2{
+ background: linear-gradient(90deg, rgb(255, 140, 138), rgb(239, 186, 141));
+ }
+ .process3 {
+ background: linear-gradient(90deg, rgb(229, 119, 180), rgb(249, 159, 192));;
+ }
+ .process4 {
+ background: linear-gradient(90deg, rgb(54, 115, 255), rgb(124, 196, 242));;
+ }
+ .process5 {
+ background: linear-gradient(90deg, rgb(0, 195, 151), rgb(114, 232, 200));;
+ }
+ .drawer{
+ :deep(.el-form .el-form-item__label) {
+ font-size: 15px;
+ }
+ }
+
}
</style>
--
Gitblit v1.9.2