From 20195d0e1cbbf3e8bfd20e2baf53e2115f663da3 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 24 一月 2024 16:38:22 +0800
Subject: [PATCH] 评价结论
---
src/api/projectManage/project.js | 8 +
src/api/projectManage/riskAnalysis.js | 26 ++++
src/views/safetyReview/projectManage/process.vue | 31 ++++-
src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue | 4
src/views/safetyReview/projectManage/components/processCtrlReview.vue | 115 ++++++++++++------
src/views/safetyReview/projectManage/components/rateConclusion.vue | 137 ++++++++++++++++------
src/views/safetyReview/projectManage/index.vue | 16 +-
7 files changed, 245 insertions(+), 92 deletions(-)
diff --git a/src/api/projectManage/project.js b/src/api/projectManage/project.js
index 8f2e6cd..f37bb1f 100644
--- a/src/api/projectManage/project.js
+++ b/src/api/projectManage/project.js
@@ -32,4 +32,10 @@
})
}
-
+//文件删除
+export function delAccessoryFile(accessoryFileId) {
+ return request({
+ url: `/manage/accessory-file/remove/` + accessoryFileId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/projectManage/riskAnalysis.js b/src/api/projectManage/riskAnalysis.js
index 9610ae0..4901cec 100644
--- a/src/api/projectManage/riskAnalysis.js
+++ b/src/api/projectManage/riskAnalysis.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+//1-风险评估
export function addRisk(data) {
return request({
url: '/manage/risk-estimate/add',
@@ -23,3 +24,28 @@
params: data
})
}
+
+//10-评价结论
+export function addRate(data) {
+ return request({
+ url: '/manage/conclusion/add',
+ method: 'post',
+ data: data
+ })
+}
+
+export function getRateDetail(data) {
+ return request({
+ url: '/manage/conclusion/getConclusionByProjectId',
+ method: 'get',
+ params: data
+ })
+}
+
+export function editRate(params) {
+ return request({
+ url: `/manage/conclusion/edit`,
+ method: 'put',
+ data: params
+ })
+}
diff --git a/src/views/safetyReview/projectManage/components/processCtrlReview.vue b/src/views/safetyReview/projectManage/components/processCtrlReview.vue
index 53a9102..70de5b4 100644
--- a/src/views/safetyReview/projectManage/components/processCtrlReview.vue
+++ b/src/views/safetyReview/projectManage/components/processCtrlReview.vue
@@ -27,7 +27,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item prop="technology" label="审核结论：是否满足过程控制要求">
<el-radio-group v-model="state.formData.status" >
<el-radio :label="1">是</el-radio>
@@ -38,17 +38,24 @@
</el-row>
<el-row :gutter="30">
<el-col :span="6">
- <el-form-item label="附件上传">
- <el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='state.imgLimit' v-model:file-list="state.fileList" list-type="picture-card" :before-upload="picSize" :on-remove="handleRemove" :before-remove="beforeRemove">
- <el-icon><Plus /></el-icon>
- <template #tip>
- <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传1张</div>
- </template>
+ <el-form-item >
+ <el-upload accept=".pdf,.doc,.docx"
+ :action="state.uploadUrl"
+ :disabled="state.disabled"
+ :headers="state.header"
+ method="post"
+ :on-success="handleAvatarSuccess"
+ v-model:file-list="state.fileList"
+ :on-remove="handleRemove"
+ :data="state.uploadData"
+ :on-preview="handlePreview"
+ >
+ <el-button type="primary">附件上传</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
- <el-table :data="state.tableData" :border="true" style="margin: 20px 0">
+ <el-table :data="state.tableData" :border="true" style="margin-bottom: 20px">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
<el-table-column label="过程控制关键点" prop="content" header-align="center" :show-overflow-tooltip="true"/>
<el-table-column label="审核结果" header-align="center" class-name="small-padding fixed-width" width="175">
@@ -96,6 +103,8 @@
import { getToken } from "@/utils/auth";
import Cookies from "js-cookie"
import ExpertsList from "./expertsList";
+import axios from "axios";
+import {delAccessoryFile} from "@/api/projectManage/project";
const emit = defineEmits(["getNextStatus"]);
const state = reactive({
@@ -127,12 +136,16 @@
{id: 9, content: '可报过程控制负责人审核', status: 1}
],
imgLimit: 1,
- uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
+ uploadUrl: import.meta.env.VITE_APP_BASE_API + '/manage/accessory-file/uploadFile',
header: {
- Authorization: 'Bearer ' + getToken()
+ Authorization: getToken()
},
dialogImageUrl: '',
- dialogImg: false
+ dialogImg: false,
+ uploadData: {
+ moduleType: 8
+ },
+ disabled: false
})
const props = {
expandTrigger: 'hover',
@@ -147,9 +160,13 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
+ if(Cookies.get('projectId')){
+ state.uploadData.projectId = Cookies.get('projectId')
+ }
})
const riskOpen = async (type,val) => {
+ state.uploadData.projectId = val;
if(type === 'detail' || type === 'edit' ){
const res = await getRiskDetail({projectId: val});
if(res.code == 200){
@@ -200,43 +217,63 @@
state.formData.leaderId = obj.id
}
-// 图片上传
-const showTip =()=>{
- ElMessage({
- type: 'warning',
- message: '超出文件上传数量'
- });
-}
-
-const picSize = async (rawFile) => {
- if(rawFile.size / 1024 / 1024 > 5){
+const handleAvatarSuccess = (res) => {
+ if(res.code === 200){
+ console.log("if",state.fileList)
ElMessage({
- type: 'warning',
- message: '文件大小不能超过5M'
- });
- return false
- }
-};
-
-const handlePictureCardPreview = (uploadFile) => {
- state.dialogImageUrl = uploadFile.url
- state.dialogImg = true
-};
-
-
-const handleAvatarSuccess = (res, uploadFile) => {
- if(res.code == 200){
- // state.registerForm.agency.reportPath = res.data.path
- }else{
+ type: 'success',
+ message: '文件上传成功'
+ })
+ }else {
ElMessage({
type: 'warning',
message: '文件上传失败'
})
}
}
+const handlePreview = (file) => {
+ let path = "";
+ if(file.path){
+ path = file.path
+ }else {
+ path = file.response.data.path
+
+ }
+ const url = import.meta.env.VITE_APP_BASE_API + '/' + path
+ axios.get( url,{
+ headers:
+ {
+ 'Content-Type': 'application/json',
+ 'Authorization':getToken(),
+ },
+ responseType: 'blob'
+ }
+ ).then(res=>{
+ if (res) {
+ const link = document.createElement('a')
+ let blob = new Blob([res.data],{type: res.data.type})
+ link.style.display = "none";
+ link.href = URL.createObjectURL(blob); // 创建URL
+ link.setAttribute("download", file.name);
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ } else {
+ this.$message.error('获取文件失败')
+ }
+ })
+}
const handleRemove = async (file, uploadFiles) => {
- const res = await delPic({path: state.registerForm.agency.reportPath})
+ console.log("file",file)
+ let accessoryFileId = "";
+ if(file.id){
+ accessoryFileId = file.id
+ }else {
+ accessoryFileId = file.response.data.id
+
+ }
+ const res = await delAccessoryFile(accessoryFileId)
if(res.code == 200){
ElMessage({
type: 'success',
diff --git a/src/views/safetyReview/projectManage/components/rateConclusion.vue b/src/views/safetyReview/projectManage/components/rateConclusion.vue
index b5d1f45..22b7dbc 100644
--- a/src/views/safetyReview/projectManage/components/rateConclusion.vue
+++ b/src/views/safetyReview/projectManage/components/rateConclusion.vue
@@ -3,19 +3,27 @@
<el-form ref="formRef" :model="state.formData" :rules="state.rules" class="register-form" label-position="top">
<el-row :gutter="30">
<el-col :span="18">
- <el-form-item label="附件上传">
- <el-upload accept=".pdf,.doc,.docx" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :limit='state.imgLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="handleRemove" :before-remove="beforeRemove">
+ <el-form-item>
+ <el-upload accept=".pdf,.doc,.docx"
+ :action="state.uploadUrl"
+ :disabled="state.disabled"
+ :headers="state.header"
+ method="post"
+ :on-success="handleAvatarSuccess"
+ :on-exceed="showTip"
+ v-model:file-list="state.fileList"
+ :on-remove="handleRemove"
+ :data="state.uploadData"
+ :on-preview="handlePreview"
+ >
<el-button type="primary">附件上传</el-button>
- <template #tip>
- <div class="el-upload__tip">支持上传pdf/word/doc/docx格式文件，尺寸小于2M,最多可上传3张</div>
- </template>
</el-upload>
</el-form-item>
</el-col>
</el-row>
- <el-form-item prop="technology" label="评价结论">
+ <el-form-item prop="conclusion" label="评价结论">
<el-input
- v-model="state.formData.technology"
+ v-model="state.formData.conclusion"
:autosize="{ minRows: 6 }"
maxlength="500"
show-word-limit
@@ -24,8 +32,8 @@
</el-form-item>
<el-row :gutter="30">
<el-col :span="9">
- <el-form-item prop="technology" label="是否有评价报告修改说明">
- <el-radio-group v-model="state.formData.status" >
+ <el-form-item prop="isReviseManual" label="是否有评价报告修改说明">
+ <el-radio-group v-model="state.formData.isReviseManual" >
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@@ -40,35 +48,31 @@
import {defineEmits, onMounted, reactive, ref} from "vue";
import {ElMessage} from "element-plus";
import {Search} from '@element-plus/icons-vue'
-import {addRisk, editRisk, getRiskDetail} from "@/api/projectManage/riskAnalysis"
+import {addRate, addRisk, editRate, editRisk, getRateDetail, getRiskDetail} from "@/api/projectManage/riskAnalysis"
import {delPic} from "@/api/login"
import { getToken } from "@/utils/auth";
import Cookies from "js-cookie"
+import {delAccessoryFile} from "@/api/projectManage/project";
+import axios from "axios";
const emit = defineEmits(["getNextStatus"]);
const state = reactive({
formData: {
- id: '',
- leader: {
- name: ''
- },
- leaderId: null,
- linkMan: '',
- transmitPerson: '',
- transmitDate: ''
+ isReviseManual: 0,
},
rules: {
- "leader.name": [{required: true, message: '请选择项目负责人', trigger: 'blur'}],
- linkMan: [{required: true, message: '请输入联系人', trigger: 'blur'}],
- linkPhone: [{required: true, message: '请输入联系电话', trigger: 'blur'}],
- transmitDate: [{required: true, message: '请选择任务下达时间', trigger: 'blur'}]
+ conclusion: [{required: true, message: '请输入评价结论', trigger: 'blur'}],
},
- tableData: [],
imgLimit: 3,
- uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
+ uploadUrl: import.meta.env.VITE_APP_BASE_API + '/manage/accessory-file/uploadFile',
header: {
- Authorization: 'Bearer ' + getToken()
- }
+ Authorization: getToken()
+ },
+ fileList: [],
+ uploadData: {
+ moduleType: 7
+ },
+ disabled: false
})
const props = {
expandTrigger: 'hover',
@@ -82,13 +86,27 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
+ if(Cookies.get('projectId')){
+ state.uploadData.projectId = Cookies.get('projectId')
+ }
})
const riskOpen = async (type,val) => {
+ state.uploadData.projectId = val;
if(type === 'detail' || type === 'edit' ){
- const res = await getRiskDetail({projectId: val});
+ if(type === 'detail'){
+ state.disabled = true
+ }
+ const res = await getRateDetail({projectId: val});
if(res.code == 200){
state.formData = res.data;
+ state.formData.isReviseManual = res.data.isReviseManual ? 1 : 0
+ state.fileList = res.data.accessoryFiles.map(item => {
+ return {
+ ...item,
+ name: item.originName,
+ }
+ })
}else {
ElMessage.warning(res.message)
}
@@ -101,8 +119,9 @@
return;
}
if(type === 'add'){
- const {id, ...data} = JSON.parse(JSON.stringify(state.formData))
- const res = await addRisk(data);
+ const {id,attachments, ...data} = JSON.parse(JSON.stringify(state.formData))
+ data.projectId = val;
+ const res = await addRate(data);
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
@@ -112,8 +131,8 @@
ElMessage.warning(res.message)
}
}else if(type === 'clickEdit'){
- const { ...data} = JSON.parse(JSON.stringify(state.formData))
- const res = await editRisk(data);
+ const { attachments, ...data} = JSON.parse(JSON.stringify(state.formData))
+ const res = await editRate(data);
if (res.code == 200) {
ElMessage.success('变更成功')
formRef.value.clearValidate();
@@ -126,7 +145,7 @@
}
}
-// 图片上传
+// 上传
const showTip =()=>{
ElMessage({
type: 'warning',
@@ -144,19 +163,63 @@
}
};
-const handleAvatarSuccess = (res, uploadFile) => {
- if(res.code == 200){
- // state.registerForm.agency.reportPath = res.data.path
- }else{
+const handleAvatarSuccess = (res) => {
+ if(res.code === 200){
+ console.log("if",state.fileList)
+ ElMessage({
+ type: 'success',
+ message: '文件上传成功'
+ })
+ }else {
ElMessage({
type: 'warning',
message: '文件上传失败'
})
}
}
+const handlePreview = (file) => {
+ let path = "";
+ if(file.path){
+ path = file.path
+ }else {
+ path = file.response.data.path
+
+ }
+ const url = import.meta.env.VITE_APP_BASE_API + '/' + path
+ axios.get( url,{
+ headers:
+ {
+ 'Content-Type': 'application/json',
+ 'Authorization':getToken(),
+ },
+ responseType: 'blob'
+ }
+ ).then(res=>{
+ if (res) {
+ const link = document.createElement('a')
+ let blob = new Blob([res.data],{type: res.data.type})
+ link.style.display = "none";
+ link.href = URL.createObjectURL(blob); // 创建URL
+ link.setAttribute("download", file.name);
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ } else {
+ this.$message.error('获取文件失败')
+ }
+ })
+}
const handleRemove = async (file, uploadFiles) => {
- const res = await delPic({path: state.registerForm.agency.reportPath})
+ console.log("file",file)
+ let accessoryFileId = "";
+ if(file.id){
+ accessoryFileId = file.id
+ }else {
+ accessoryFileId = file.response.data.id
+
+ }
+ const res = await delAccessoryFile(accessoryFileId)
if(res.code == 200){
ElMessage({
type: 'success',
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 10ca670..fee40d3 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -230,6 +230,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);
@@ -252,8 +253,8 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
params:{
- projectPhase: '',
lostMaterial: null
}
},
@@ -287,6 +288,7 @@
const total = ref(0);
onMounted(() => {
+ Cookies.remove('projectId')
getList();
getStatistics();
getArea();
@@ -302,12 +304,11 @@
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 => {
@@ -329,12 +330,9 @@
}
const getStatistics = async () => {
const {pageNum,pageSize, ...data} = JSON.parse(JSON.stringify(search.queryParams))
- console.log("data",data)
const res = await getProjectStatistics(data);
if(res.code == 200){
- console.log("res统计",res)
search.num = res.data
-
}else{
ElMessage.warning(res.message)
}
@@ -429,8 +427,12 @@
district: '',
business: '',
estimateType: '',
+ phase: '',
+ params: {
+ lostMaterial: null
+ }
}
- search.queryParams.params = {}
+ chooseType.value = '';
getList();
getStatistics();
showDrawer.value = false;
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index d1a2bdf..3cba04f 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -98,7 +98,7 @@
import ProjectArchive from "./components/projectArchive"
import SignConfirm from "./components/signConfirm"
import ConfirmEnd from "./components/confirmEnd"
-
+import Cookies from "js-cookie"
const route = useRoute()
const menuList = ref([
{
@@ -457,6 +457,7 @@
setTimeout(() => {
isShowMenu.value = false;
selectedObj.value = val;
+
}, 10)
}else if(val.status === 2){
setTimeout(() => {
@@ -493,11 +494,7 @@
selectedObj.value.status = 1;
nextObj.value.status = 2;
nextObj.value = val;
- // if(flag){
- // setTimeout(() => {
- // goRouter(selectedObj.value.id)
- // }, 10)
- // }
+ Cookies.set('projectId',projectId.value);
//跳转
}, 10)
}
@@ -761,9 +758,31 @@
console.log("9")
break;
case 10:
+ if(type === 'add'){
+ rateConRef.value.riskOpen('add',projectId.value);
+ }else if (type === 'clickEdit'){
+ rateConRef.value.riskOpen('clickEdit',projectId.value);
+ }else {
+ if(projectStatus.value === 'view' || projectStatus.value === 'add'){
+ rateConRef.value.riskOpen('detail',projectId.value);
+ }else if(projectStatus.value === 'edit'){
+ rateConRef.value.riskOpen('edit',projectId.value);
+ }
+ }
console.log("10")
break;
case 11:
+ if(type === 'add'){
+ proCtrlRef.value.riskOpen('add',projectId.value);
+ }else if (type === 'clickEdit'){
+ proCtrlRef.value.riskOpen('clickEdit',projectId.value);
+ }else {
+ if(projectStatus.value === 'view' || projectStatus.value === 'add'){
+ proCtrlRef.value.riskOpen('detail',projectId.value);
+ }else if(projectStatus.value === 'edit'){
+ proCtrlRef.value.riskOpen('edit',projectId.value);
+ }
+ }
console.log("11")
break;
case 12:
diff --git a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
index 70dedc2..2651808 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue
@@ -158,8 +158,8 @@
toProcess('edit',val,toPath);
}
const conversionDays = (createTime) => {
- let day = Date.now() - new Date(createTime).getTime();//日期转时间戳
- return Math.floor(day / 86400000) ;//时间戳获取天数
+ let day = Date.now() - new Date(createTime).getTime();
+ return Math.floor(day / 86400000) ;
}
defineExpose({
--
Gitblit v1.9.2