From 514a9cc10622d996c3cfe1f3a2e955d52e7fc0c3 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Fri, 23 Feb 2024 15:55:36 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
index 2651808..3637bbd 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
@@ -39,20 +39,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="缺失要件" prop="" 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>
@@ -60,7 +60,7 @@
<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-if="scope.row.process === 5 && scope.row.personRecognition" @click="goMenu('toThirteen',scope.row)">{{scope.row.personRecognition.recognitionCnt}}/{{scope.row.personRecognition.personCnt}}</span>
<span v-else></span>
</div>
</template>
@@ -93,6 +93,7 @@
<script setup>
import {reactive, ref} from "vue";
import {getProjectList} from "@/api/projectManage/project";
+import {ElMessage} from "element-plus";
const loading = ref(false);
const dataList = ref([]);
const tableRef = ref(null);
@@ -124,10 +125,11 @@
...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 ? item.filingDate : conversionDays(item.createTime),
contractMoney: item.contract ? item.contract.contractMoney : '',
- actualContractMoney: item.contract ? item.contract.actualContractMoney : ''
+ actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+ missingMaterialCnt: 3-item.materialCnt
}
})
console.log(dataList.value,'dataList.value')
@@ -155,6 +157,10 @@
}
const goMenu = (toPath,val) => {
console.log("val",val)
+ if(toPath ==='toThirteen' && val.personRecognition && val.personRecognition. recognitionCnt === 0){
+ ElMessage.warning('未进行签字确认，无法查看！')
+ return;
+ }
toProcess('edit',val,toPath);
}
const conversionDays = (createTime) => {
--
Gitblit v1.9.2