From b1adf4175b8027813358391edcbd440886724523 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期二, 20 二月 2024 17:30:14 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/signConfirm.vue | 35 +++++++++++++----------------------
src/views/safetyReview/projectManage/index.vue | 14 +++++++++-----
2 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/signConfirm.vue b/src/views/safetyReview/projectManage/components/signConfirm.vue
index 49269a0..844442c 100644
--- a/src/views/safetyReview/projectManage/components/signConfirm.vue
+++ b/src/views/safetyReview/projectManage/components/signConfirm.vue
@@ -1,10 +1,10 @@
<template>
<div class="riskBox">
- <el-table v-loading="loading" ref="tableRef" :data="tableData" :border="true">
+ <el-table v-loading="loading" ref="tableRef" :data="tableData" :border="true" style="margin-top: 20px">
<el-table-column label="序号" type="index" width="55" />
- <el-table-column label="人员姓名" prop="person.name" align="center"/>
- <el-table-column label="联系电话" prop="person.phone" align="center"/>
- <el-table-column label="职位" prop="person.post" align="center"/>
+ <el-table-column label="人员姓名" prop="planPerson.person.name" align="center"/>
+ <el-table-column label="联系电话" prop="planPerson.person.phone" align="center"/>
+ <el-table-column label="职位" prop="planPerson.person.post" align="center"/>
<el-table-column label="项目担任角色" prop="username" align="center">
<template #default="scope">
<span>{{ scope.row.planPerson.playRole === 1?'项目负责人': scope.row.planPerson.playRole === 2?
@@ -14,9 +14,9 @@
</span>
</template>
</el-table-column>
- <el-table-column label="评价师等级" prop="person.level" align="center"/>
- <el-table-column label="专业能力" prop="username" align="center"/>
- <el-table-column label="人员类型" prop="username" align="center">
+ <el-table-column label="评价师等级" prop="planPerson.person.level" align="center"/>
+ <el-table-column label="专业能力" prop="planPerson.person.majorNames" align="center"/>
+ <el-table-column label="工作类型" align="center">
<template #default="scope">
<span>{{scope.row.planPerson.jobType === 1 ? '普通人员' : scope.row.planPerson.jobType === 2?'组长': ''}}</span>
</template>
@@ -28,7 +28,7 @@
<span v-else>否</span>
</template>
</el-table-column>
- <el-table-column label="是否变更" prop="username" align="center"/>
+<!-- <el-table-column label="是否变更" prop="username" align="center"/>-->
<el-table-column label="人脸照片" prop="socialSecurity" align="center" width="120">
<template #default="scope">
<div class="demo-image__preview" v-if="scope.row.facePic && scope.row.facePic.length>0">
@@ -133,10 +133,6 @@
facePic: item.faceRecord ? [import.meta.env.VITE_APP_BASE_API + '/' + item.faceRecord.facePath ] : [],
signPic: item.signPath ? [import.meta.env.VITE_APP_BASE_API + '/' + item.signPath] : [],
commitPic: item.insurancePath ? [import.meta.env.VITE_APP_BASE_API + '/' + item.insurancePath] : [],
- planPerson: {
- playRole: item.planPerson ? item.planPerson.playRole : '',
- jobType: item.planPerson ? item.planPerson.jobType : '',
- }
}
})
console.log("res",res)
@@ -157,16 +153,11 @@
return;
}
if(type === 'add'){
- const resCheck = await checkAll({projectId: val});
- if (resCheck.code == 200) {
- const res = await addFaceRecognition({projectId: val});
- if (res.code == 200) {
- ElMessage.success('保存成功')
- formRef.value.clearValidate();
- emit('getNextStatus', val);
- } else {
- ElMessage.warning(res.message)
- }
+ const res = await addFaceRecognition({projectId: val});
+ if (res.code == 200) {
+ ElMessage.success('保存成功')
+ formRef.value.clearValidate();
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index e07fa65..672de99 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -119,8 +119,8 @@
<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 && scope.row.personRecognition" @click="goMenu('toThirteen',scope.row)">{{scope.row.personRecognition.recognitionCnt}}/{{scope.row.personRecognition.personCnt}}</span>
- <span v-else></span>
+ <span @click="goMenu('toThirteen',scope.row)">{{scope.row.activeConfirm}}</span>
+<!-- <span v-else></span>-->
</div>
</template>
</el-table-column>
@@ -319,7 +319,8 @@
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 : ''
+ actualContractMoney: item.contract ? item.contract.actualContractMoney : '',
+ activeConfirm: item.personRecognition ? item.personRecognition.recognitionCnt + '/' + item.personRecognition.personCnt: ''
}
})
total.value = res.data.total
@@ -484,14 +485,17 @@
}
},
'项目实施天数': 'filingDate',
- '项目变更': '',
'预估金额（万元）': 'contractMoney',
'归档金额（万元）': 'actualContractMoney',
'缺失要件': 'materialCnt',
- '归档确认': ''
+ '归档确认': 'activeConfirm'
});
const goMenu = (toPath,val) => {
console.log("val",val)
+ if(val.personRecognition && val.personRecognition. recognitionCnt === 0){
+ ElMessage.warning('未进行签字确认，无法查看！')
+ return;
+ }
toProcess('edit',val,toPath);
}
--
Gitblit v1.9.2