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/components/projectArchive.vue | 260 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 206 insertions(+), 54 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/projectArchive.vue b/src/views/safetyReview/projectManage/components/projectArchive.vue
index 7f832e3..f08ad21 100644
--- a/src/views/safetyReview/projectManage/components/projectArchive.vue
+++ b/src/views/safetyReview/projectManage/components/projectArchive.vue
@@ -2,49 +2,58 @@
<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="6">
- <el-button type="primary" @click="addUpload">新增附件</el-button>
+ <el-col :span="10">
+<!-- <el-button type="primary" :disabled="projectType === 'edit'" @click="addUpload">新增附件列表</el-button>-->
+ <span style="font-size: 20px;font-weight: 600">附件列表</span>
+ <span style="font-size: 13px;color: rgb(232, 78, 79);font-weight: 400;margin-left: 10px">项目列表仅支持pdf、jpg、jpeg 等格式上传</span>
</el-col>
</el-row>
<el-table :data="state.uploadList" :border="true" style="margin: 20px 0">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
- <el-table-column label="名称" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="名称" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-input v-model="scope.row.fileName" maxlength="30" show-word-limit type="text" size="large"/>
+ <span type="text" size="large">{{scope.row.name}}</span>
</template>
</el-table-column>
- <el-table-column label="是否必须文件" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="是否必须文件" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-radio-group v-model="state.formData.status" >
+ <el-radio-group v-model="scope.row.type" >
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</template>
</el-table-column>
- <el-table-column label="原因说明" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="原因说明" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-input v-model="scope.row.deviceName" maxlength="50" show-word-limit type="text" size="large"/>
+ <el-input v-model="scope.row.remark" show-word-limit type="text" size="large" />
</template>
</el-table-column>
- <el-table-column label="附件上传" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="附件上传" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-upload accept="image/*,.pdf" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :limit='1' v-model:file-list="state.fileList[scope.$index]" :before-upload="picSize" :on-remove="handleRemove" :before-remove="beforeRemove">
+ <el-upload accept=".pdf,.doc,.docx"
+ :action="state.uploadUrl"
+ :disabled="projectType === 'view' || isEnd"
+ :headers="state.header"
+ method="post"
+ :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,scope.row)"
+ v-model:file-list="scope.row.fileList"
+ :on-remove="handleRemove"
+ :data="state.uploadData"
+ :on-preview="handlePreview"
+ >
<el-button type="primary">附件上传</el-button>
- <template #tip>
- <div class="el-upload__tip">上传图片或pdf尺寸小于5M,最多可上传1张</div>
- </template>
</el-upload>
</template>
</el-table-column>
- <el-table-column label="操作" header-align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="danger" @click="delUpload(scope.$index)">删除</el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!-- <template #default="scope">-->
+<!-- <el-button link type="danger" @click="delUpload(scope.$index)">删除</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
<el-row :gutter="30">
<el-col :span="6">
- <el-form-item prop="contractSignDate" label="合同签订日期">
+ <el-form-item label="合同签订日期">
<el-date-picker
style="width: 100%"
v-model="state.formData.contractSignDate"
@@ -56,15 +65,16 @@
</el-form-item>
</el-col>
<el-col :span="18">
- <el-form-item prop="contractMoney">
+ <el-form-item prop="actualContractMoney">
<template #label>
项目合同额<span style="font-size: 13px;color: red;font-weight: normal;display: inline-block;margin-left: 6px">预估合同金额，归档阶段可以进行修改。仅支持数字，单位万元，小数点后最多两位，数值范围（0.01-999.99）</span>
</template>
<el-input
- v-model="state.formData.contractMoney"
+ v-model="state.actualContract.actualContractMoney"
size="large"
type="number"
placeholder="请输入项目合同额"
+ @input="state.actualContract.actualContractMoney= state.actualContract.actualContractMoney.replace(/[^\d|\.]/g,'')"
>
<template #append>万元</template>
</el-input>
@@ -73,7 +83,7 @@
</el-row>
<el-form-item label="实际合同额说明">
<el-input
- v-model="state.formData.contractIntroduction"
+ v-model="state.actualContract.actualContractIntroduction"
:autosize="{ minRows: 6 }"
maxlength="100"
show-word-limit
@@ -86,47 +96,104 @@
</template>
<script setup>
-import {defineEmits, onMounted, reactive, ref} from "vue";
+import {defineEmits, defineProps, onMounted, reactive, ref} from "vue";
import {ElMessage} from "element-plus";
import {addRecord, editRecord, getDetail} from "@/api/projectManage/contractMng";
import Cookies from "js-cookie";
import { getToken } from "@/utils/auth";
-
+import axios from "axios";
+import {delAccessoryFile, getAccessoryFile} from "@/api/projectManage/project";
+import {addProcessMaterial, getProcessMaterialDetail, editProcessMaterial} from "@/api/projectManage/riskAnalysis";
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"]);
const state = reactive({
formData: {
id: '',
contractSignDate: '',
- contractMoney: '',
- contractIntroduction: ''
+
},
- uploadList: [],
+ actualContract: {
+ actualContractMoney: '',
+ actualContractIntroduction: ''
+ },
+ uploadList: [
+ {
+ name: '安全评价过程控制记录文档',
+ type: 1,
+ remark: '',
+ },
+ {
+ name: '项目发票电子版',
+ type: 1,
+ remark: '',
+ },
+ {
+ name: '项目转账记录/入账证明',
+ type: 1,
+ remark: '',
+ }
+ ],
rules: {
contractSignDate: [{required: true, message: '请选择合同签订日期', trigger: 'blur'}],
- contractMoney: [{required: true, message: '请输入项目合同额', trigger: 'blur'}]
},
fileList: [],
- 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()
+ },
+ uploadData: {
+ moduleType: 9
+ },
})
const isAmin = ref(false)
const formRef = ref();
-onMounted(() => {
+onMounted(async () => {
const userInfo = JSON.parse(Cookies.get('userInfo'))
if(userInfo.identity === 0){
isAmin.value = true;
}
+ if(props.projectId){
+ state.uploadData.projectId = props.projectId;
+ await getRecord(state.uploadData.projectId);
+ // const res = await getAccessoryFile({projectId: val,moduleType: 9});
+ // console.log('res',res)
+ }
+ isEnd.value = Cookies.get('end')
+ projectType.value = route.query.type;
});
+const getRecord = async (val) =>{
+ const res = await getDetail({projectId: val});
+ if(res.code == 200){
+ state.formData = res.data;
+ state.actualContract.actualContractMoney = res.data.actualContractMoney;
+ state.actualContract.actualContractIntroduction = res.data.actualContractIntroduction;
+ }else {
+ ElMessage.warning(res.message)
+ }
+}
+
+const projectType = ref('')
+const isEnd = ref('')
const riskOpen = async (type,val) => {
- state.formData.projectId = val;
+ projectType.value = route.query.type;
+ isEnd.value = Cookies.get('end')
+ state.uploadData.projectId = val;
if(type === 'detail' || type === 'edit' ){
- const res = await getDetail({projectId: val});
+ const res = await getProcessMaterialDetail({projectId: val});
if(res.code == 200){
- state.formData = res.data;
+ state.uploadList = res.data;
+ state.uploadList.forEach((item,index) => {
+ if(item.accessoryFile){
+ item.accessoryFile.name = item.accessoryFile.originName
+ state.uploadList[index].fileList = [item.accessoryFile];
+ }
+ })
+
+ console.log("res",state.uploadList)
}else {
ElMessage.warning(res.message)
}
@@ -138,21 +205,60 @@
ElMessage.warning("当前用户暂无权限");
return;
}
+
+ if(state.actualContract.actualContractMoney == '' || !state.actualContract.actualContractMoney) {
+ ElMessage.warning("请输入项目合同额");
+ return;
+ }
+ console.log(state.uploadList,'state.uploadList')
+ const file = state.uploadList.map(item => {
+ return{
+ id: item.id ? item.id : null,
+ fileId: item.fileList && item.fileList.length>0 ? item.fileList[0].response ? item.fileList[0].response.data.id : item.fileList[0].id : '',
+ name: item.name,
+ type: item.type,
+ remark: item.remark,
+ projectId: val
+ }
+ })
+
+ let isOk = false;
+ try{
+ state.uploadList.forEach(item => {
+ if(item.type == 1 && (!item.fileList || item.fileList .length == 0) && item.remark == ""){
+ isOk = true;
+ throw Error();
+ }
+ })
+ }catch (e) {}
+
+ if(isOk){
+ ElMessage.warning("请上传附件或完善原因说明！");
+ return;
+ }
+ const { ...data} = JSON.parse(JSON.stringify(state.formData))
+ data.actualContractMoney = state.actualContract.actualContractMoney;
+ data.actualContractIntroduction = state.actualContract.actualContractIntroduction;
+ const params = {
+ projectId: val,
+ projectMaterials: file,
+ contract: data
+ }
+ console.log("params",params)
if(type === 'add'){
- const {id, ...data} = JSON.parse(JSON.stringify(state.formData))
- const res = await addRecord(data);
+ const res = await addProcessMaterial(params);
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
- emit('getNextStatus', state.formData.projectId);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
}else if(type === 'clickEdit'){
- const { ...data} = JSON.parse(JSON.stringify(state.formData))
- const res = await editRecord(data);
+ const res = await editProcessMaterial(params);
if (res.code == 200) {
ElMessage.success('变更成功')
+ projectType.value='edit';
formRef.value.clearValidate();
// emit('getNextStatus', data.project.id);
} else {
@@ -163,12 +269,12 @@
}
}
+
const addUpload = ()=>{
let file = {
- fileName: '',
- deviceName: '',
- startDate: '',
- endDate: ''
+ name: '',
+ type: 1,
+ remark: '',
}
state.uploadList.push(file)
}
@@ -195,24 +301,70 @@
}
};
-const handleAvatarSuccess = (res, uploadFile) => {
- if(res.code == 200){
- // state.registerForm.agency.reportPath = res.data.path
- }else{
+const handleAvatarSuccess = (res, uploadFile,val) => {
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: '文件上传成功'
+ })
+ }else {
+ const delVal = state.uploadList.findIndex(i => i.id === val.id);
+ state.uploadList[delVal].fileList.splice(state.uploadList[delVal].fileList.indexOf(uploadFile),1)
ElMessage({
type: 'warning',
- message: '文件上传失败'
+ message: res.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',
- message: '文件已删除'
- })
+ // ElMessage({
+ // type: 'success',
+ // message: '文件已删除'
+ // })
}else{
ElMessage({
type: 'warning',
--
Gitblit v1.9.2