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/components/rateConclusion.vue | 182 ++++++++++++++++++++++++++++-----------------
1 files changed, 114 insertions(+), 68 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/rateConclusion.vue b/src/views/safetyReview/projectManage/components/rateConclusion.vue
index 4d3d231..577cefe 100644
--- a/src/views/safetyReview/projectManage/components/rateConclusion.vue
+++ b/src/views/safetyReview/projectManage/components/rateConclusion.vue
@@ -1,26 +1,6 @@
<template>
<div class="riskBox">
<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>
- <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>
- </el-upload>
- </el-form-item>
- </el-col>
- </el-row>
<el-form-item prop="conclusion" label="评价结论">
<el-input
v-model="state.formData.conclusion"
@@ -32,11 +12,37 @@
</el-form-item>
<el-row :gutter="30">
<el-col :span="9">
- <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>
+ <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>-->
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="18">
+ <el-form-item>
+ <el-upload
+ accept="image/*,.pdf,.doc,.docx,.xlsx,.xls"
+ :action="state.uploadUrl"
+ :disabled="projectType === 'view' || isEnd"
+ :headers="state.header"
+ method="post"
+ :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)"
+ :on-exceed="showTip"
+ v-model:file-list="state.fileList"
+ :on-remove="handleRemove"
+ :data="state.uploadData"
+ :on-preview="handlePreview"
+ :limit='15'
+ :before-upload="picSize"
+ >
+ <el-button type="primary">评价报告上传</el-button>
+ <template #tip>
+ <div class="el-upload__tip">上传文件尺寸小于15M，最多可上传15份，多张图片建议合并为PDF文件规范上传。</div>
+ </template>
+ </el-upload>
</el-form-item>
</el-col>
</el-row>
@@ -45,8 +51,8 @@
</template>
<script setup>
-import {defineEmits, onMounted, reactive, ref} from "vue";
-import {ElMessage} from "element-plus";
+import {defineEmits, defineProps, onMounted, reactive, ref} from "vue";
+import {ElMessage, ElMessageBox} from "element-plus";
import {Search} from '@element-plus/icons-vue'
import {addRate, addRisk, editRate, editRisk, getRateDetail, getRiskDetail} from "@/api/projectManage/riskAnalysis"
import {delPic} from "@/api/login"
@@ -54,11 +60,14 @@
import Cookies from "js-cookie"
import {delAccessoryFile, getAccessoryFile} from "@/api/projectManage/project";
import axios from "axios";
+import {delFile, getFiles} from "@/api/projectManage/siteCheckRcd";
+import { useRoute } from 'vue-router'
+const route = useRoute()
const emit = defineEmits(["getNextStatus"]);
-
+const prop = defineProps(['projectId'])
const state = reactive({
formData: {
- isReviseManual: 0,
+ isReviseManual: 1,
},
rules: {
conclusion: [{required: true, message: '请输入评价结论', trigger: 'blur'}],
@@ -86,27 +95,21 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
- if(Cookies.get('projectId')){
- const val = Cookies.get('projectId');
+ if(prop.projectId){
+ const val = prop.projectId;
state.uploadData.projectId = val;
- const res = getAccessoryFile({projectId: val,moduleType: 7});
- if(res.code == 200){
- if(res.data){
- state.fileList = res.data.accessoryFiles.map(item => {
- return {
- ...item,
- name: item.originName,
- }
- })
- }else {
- ElMessage.warning(res.message)
- }
- }
+ getProcessFiles(val);
}
+ isEnd.value = Cookies.get('end')
+ projectType.value = route.query.type;
})
+const projectType = ref('');
+const isEnd = ref('')
const riskOpen = async (type,val) => {
state.uploadData.projectId = val;
+ projectType.value = route.query.type;
+ isEnd.value = Cookies.get('end')
if(type === 'detail' || type === 'edit' ){
if(type === 'detail'){
state.disabled = true
@@ -129,6 +132,11 @@
}
if(type === 'add' || type === 'clickEdit') {
const valid = await formRef.value.validate();
+ if(state.fileList && state.fileList.length<=0 ){
+ ElMessage.warning('请上传评价报告')
+ return
+ }
+
if(valid){
if (isAmin.value) {
ElMessage.warning("当前用户暂无权限");
@@ -137,6 +145,7 @@
if(type === 'add'){
const {id,attachments, ...data} = JSON.parse(JSON.stringify(state.formData))
data.projectId = val;
+ data.accessoryFiles = state.fileList
const res = await addRate(data);
if (res.code == 200) {
ElMessage.success('保存成功')
@@ -148,6 +157,7 @@
}
}else if(type === 'clickEdit'){
const { attachments, ...data} = JSON.parse(JSON.stringify(state.formData))
+ data.accessoryFiles = state.fileList
const res = await editRate(data);
if (res.code == 200) {
ElMessage.success('变更成功')
@@ -170,28 +180,30 @@
}
const picSize = async (rawFile) => {
- if(rawFile.size / 1024 / 1024 > 2){
+ if(rawFile.size / 1024 / 1024 > 15){
ElMessage({
type: 'warning',
- message: '文件大小不能超过2M'
+ message: '文件大小不能超过15M'
});
return false
}
};
-const handleAvatarSuccess = (res) => {
+const handleAvatarSuccess = (res,uploadFile) => {
if(res.code === 200){
- console.log("if",state.fileList)
+ getProcessFiles()
ElMessage({
type: 'success',
message: '文件上传成功'
})
}else {
+ state.fileList.splice(state.fileList.indexOf(uploadFile),1)
ElMessage({
type: 'warning',
- message: '文件上传失败'
+ message: res.message
})
}
+
}
const handlePreview = (file) => {
let path = "";
@@ -225,27 +237,61 @@
}
})
}
+const getProcessFiles = async (id)=>{
+ const res = await getFiles({projectId: id ? id : prop.projectId ,moduleType: 7})
+ if(res.code == 200){
+ if(res.data && res.data.length>0){
+ state.fileList = res.data.map(i=>{
+ return {
+ name: i.originName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ }else{
+ state.fileList = []
+ }
+ }else {
+ ElMessage.warning(res.message)
+ }
+}
const handleRemove = async (file, uploadFiles) => {
- 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',
- message: '文件已删除'
- })
- }else{
- ElMessage({
- type: 'warning',
- message: res.message
- })
+ if (file && file.status === 'success') {
+ ElMessageBox.confirm(
+ '确定删除该附件？',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(async () => {
+ 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',
+ message: '文件已删除'
+ })
+ await getProcessFiles()
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.message
+ })
+ }
+ })
+ .catch(() => {
+ getProcessFiles()
+ })
}
}
--
Gitblit v1.9.2