From 0483a508bd7e37b31a4e6c6ff782bc623abb60de Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Fri, 14 Jun 2024 10:27:53 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/index.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index fff085e..94994c5 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -69,6 +69,7 @@
<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">
@@ -128,7 +129,7 @@
<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>
@@ -286,7 +287,7 @@
const tableHeight = ref(0);
const dataList = ref([]);
const total = ref(0);
-
+const isAgency = ref(false);
onMounted(() => {
Cookies.remove('projectId')
Cookies.remove('end')
@@ -301,6 +302,8 @@
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('');
@@ -322,12 +325,14 @@
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
+ 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)
}
@@ -490,8 +495,8 @@
'项目实施天数': 'filingDate',
'预估金额（万元）': 'contractMoney',
'归档金额（万元）': 'actualContractMoney',
- '缺失要件': 'materialCnt',
- '归档确认': 'activeConfirm'
+ '缺失要件': 'missingMaterialCnt',
+ '归档确认': 'activeConfirmOut'
});
const goMenu = (toPath,val) => {
console.log("val",val)
--
Gitblit v1.9.2