From b609f77709c4646daf155341475ae14fc0c7943d Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 27 六月 2025 13:25:30 +0800
Subject: [PATCH] 修改
---
src/views/safetyReview/projectManage/components/projectApproval.vue | 293 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 210 insertions(+), 83 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/projectApproval.vue b/src/views/safetyReview/projectManage/components/projectApproval.vue
index 8a854d5..576829d 100644
--- a/src/views/safetyReview/projectManage/components/projectApproval.vue
+++ b/src/views/safetyReview/projectManage/components/projectApproval.vue
@@ -1,33 +1,35 @@
<template>
<div class="approval">
- <el-form :model="state.dataForm" ref="dataForm" :inline="true" style="margin-top: 10px" label-width="130px" >
+ <el-form :model="state.dataForm" ref="dataForm" :inline="true" style="margin-top: 10px" label-width="180px" >
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="项目名称:">
+ <el-form-item label="出差事由:">
<span>{{state.dataForm.projectName}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="被检查/对接单位：">
- <span>{{state.dataForm.companyName ? state.dataForm.companyName: '--'}}</span>
+ <el-form-item label="项目预计时间区间:">
+ <span>{{state.dataForm.projectDateStart}}—{{state.dataForm.projectDateEnd}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="计划实行时间:">
- <span>{{state.dataForm.projectDateStart}}—{{state.dataForm.projectDateEnd}}</span>
+ <el-form-item label="目的地及相关企业名称等：">
+ <span>{{state.dataForm.projectAddress}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="项目地点：">
- <span>{{state.dataForm.projectAddress}}</span>
+ <el-form-item prop="jobCategoryArr" label="工作类别">
+ <el-checkbox-group v-model="state.jobCategoryArr" disabled>
+ <el-checkbox v-for="item in state.directionList" :label="item.value" :key="item.value">{{ item.label }}</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
- <el-form-item label="项目概况:">
+ <el-form-item label="备注:">
<span>{{state.dataForm.remark}}</span>
</el-form-item>
</el-col>
@@ -43,7 +45,7 @@
<el-table-column label="身份证号" prop="idCard" align="center" />
<el-table-column label="等级" prop="ratingLevel" align="center" >
<template #default="scope">
- <span>{{scope.row.ratingLevel == 1 ?'一级':scope.row.ratingLevel == 1?'二级':'三级'}}</span>
+ <span>{{scope.row.ratingLevel == 1 ?'一级':scope.row.ratingLevel == 2?'二级':scope.row.ratingLevel == 3 ?'三级':''}}</span>
</template>
</el-table-column>
<el-table-column label="专业领域" prop="domain" align="center" />
@@ -58,12 +60,12 @@
<span v-else>否</span>
</template>
</el-table-column>
- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
- <template #default="scope">
- <el-button link type="primary" v-if="scope.row.teamLeader === 1" @click="scope.row.teamLeader = 0">取消组长</el-button>
- <el-button link type="primary" v-else @click="scope.row.teamLeader = 1">设为组长</el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">-->
+<!-- <template #default="scope">-->
+<!-- <el-button link type="primary" :disabled="state.dataForm.state >= 2 || state.isAdmin" v-if="scope.row.teamLeader === 1" @click="scope.row.teamLeader = 0">取消组长</el-button>-->
+<!-- <el-button link type="primary" :disabled="state.dataForm.state >= 2 || state.isAdmin" v-else @click="scope.row.teamLeader = 1">设为组长</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
<el-dialog
v-model="dialogVisible"
@@ -81,18 +83,18 @@
<div style="margin-top: 30px">
<div style="display: flex">
<span style="font-size: 18px;font-weight: 600">审批记录附件：</span>
- <el-upload :disabled="projectType==='view'" accept=".pdf" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)">
+ <el-upload :disabled="projectType==='view' || isView" accept=".pdf" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)">
<el-button type="primary">上传附件PDF</el-button>
<template #tip>
- <div class="el-upload__tip">上传文件尺寸小于5M,最多可上传1份</div>
+ <div class="el-upload__tip">上传文件尺寸小于15M,最多可上传1份</div>
</template>
</el-upload>
</div>
</div>
<template #footer>
<div class="dialog-footer">
- <el-button type="success" @click="nextStatus">线下审批通过并进行下一步</el-button>
- <el-button type="warning" style="margin-left: 40px;" @click="back">线下审批不通过返回上一步</el-button>
+ <el-button type="success" v-if="!isView" @click="nextStatus">线下审批通过并进行下一步</el-button>
+ <el-button type="warning" v-if="!isView" style="margin-left: 40px;" @click="back">线下审批不通过返回上一步</el-button>
</div>
</template>
</el-dialog>
@@ -106,7 +108,9 @@
import {getToken} from "@/utils/auth";
import axios from "axios";
import {generateWordDocument} from "@/views/safetyReview/projectManage/components/exportWord";
-import {getCheckInfo, getProjectList} from "@/api/projectManage";
+import {addProject, checkProject, choose, getCheckInfo, getFileInfo, getProjectList} from "@/api/projectManage";
+import Cookies from "js-cookie";
+import moment from "moment";
const emit = defineEmits(["getNextStatus","backStatus"]);
const prop = defineProps(['projectId'])
const tableRef = ref()
@@ -120,8 +124,10 @@
projectDateEnd: '',
projectAddress: '',
remark: '',
- projectCheckTime: ''
+ projectCheckTime: '',
+ state: ''
},
+ jobCategoryArr: [],
queryParams: {
pageNum: 1,
pageSize: 20,
@@ -134,38 +140,95 @@
Authorization: getToken()
},
fileList: [],
- projectId: null
+ projectId: null,
+ isAdmin: false,
+ directionList: [
+ {
+ value: '1',
+ label: '现场检查'
+ },
+ {
+ value: '2',
+ label: '调查评估'
+ },
+ {
+ value: '3',
+ label: '咨询服务'
+ },
+ {
+ value: '4',
+ label: '教育培训'
+ },
+ {
+ value: '5',
+ label: '其他'
+ }
+ ],
});
const projectType = ref('')
+const userInfo = ref()
onMounted(async () => {
if(prop.projectId){
state.projectId = prop.projectId
await getList()
+
}
+ userInfo.value = JSON.parse(Cookies.get('userInfo'))
+ state.isAdmin = userInfo.value.admin
})
+const isView = ref(false)
const riskOpen = async (type,val) => {
+ state.fileList = []
console.log("type",type,val)
//生成审批按钮
if(type === 'confirmApproval'){
+ if (state.isAdmin) {
+ ElMessage.warning("当前用户暂无权限");
+ return;
+ }
+ isView.value = false
+ if(state.dataForm.state == 2){
+ dialogVisible.value = true
+ }else {
+ ElMessageBox.confirm(
+ '生成后不可更改，确定生成审批单？',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then( async() => {
+ const data = {
+ id: state.projectId,
+ step: 3,
+ saveData: state.dataList
+ }
+ const res = await choose(data);
+ if(res.code == 200){
+ await getList()
+ dialogVisible.value = true
+ }else{
+ ElMessage.warning(res.message)
+ }
+ })
+ }
+ }else if(type === 'viewWord'){
+ //查看审批单
+ isView.value = true
+ await getFile()
dialogVisible.value = true
-
-
- // emit('getNextStatus', 3);
-
- }else if(type === 'clickEdit'){
- //变更按钮
-
}else if(type === 'detail' || type === 'view'){
if(type === 'view'){
projectType.value = type
}
- console.log("view333333",type,val)
+ await getFile()
}
}
-const nextStatus = () =>{
+const nextStatus = async () =>{
if(state.fileList && state.fileList.length ===0){
state.fileList = []
ElMessage({
@@ -174,12 +237,54 @@
})
return;
}
- dialogVisible.value = false
- emit('getNextStatus', 3);
+ const param = {
+ id: state.projectId,
+ projectFile: state.fileList,
+ state: 3
+ }
+ const res = await checkProject(param);
+ if(res.code == 200){
+ ElMessage.success('审批通过')
+ emit('getNextStatus', state.projectId);
+ dialogVisible.value = false
+ }else{
+ ElMessage.warning(res.message)
+ }
+
}
-const back = () => {
- // emit('backStatus', 1);//回到状态1
- dialogVisible.value = false
+const back = async () => {
+ const param = {
+ id: state.projectId,
+ projectFile: state.fileList,
+ state: 1
+ }
+ const res = await checkProject(param);
+ if(res.code == 200){
+ ElMessage.warning('审批不通过')
+ emit('backStatus', state.projectId);
+ dialogVisible.value = false
+ removeRandomNum()
+
+
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+const removeRandomNum = () => {
+ const rnData = localStorage.getItem('randomNum')
+ let rnDataArray = []
+ if (rnData) {
+ try {
+ rnDataArray = JSON.parse(rnData);
+ } catch (e) {
+ console.error('数据解析失败，重置为空数组');
+ }
+ }
+ const indexRN = rnDataArray.findIndex(obj => obj.projectId == state.projectId)
+ if(indexRN !== -1){
+ rnDataArray.splice(indexRN,1)
+ }
+ localStorage.setItem('randomNum', JSON.stringify(rnDataArray));
}
const getList = async () => {
@@ -189,7 +294,13 @@
}
const res = await getCheckInfo(param);
if(res.code == 200){
- state.dataList = res.data.projectExpertCheckResp
+ state.dataList = res.data.projectExpertCheckResp.map(item => {
+ return {
+ ...item,
+ teamLeader: item.teamLeader ? item.teamLeader : 0,
+ expertName: item.name
+ }
+ })
if(res.data) {
const val = res.data
for(let i in state.dataForm) {
@@ -198,8 +309,12 @@
}
}
state.dataForm.projectCheckTime = res.data.projectCheckTime ?res.data.projectCheckTime : ''
+ if(res.data.jobCategory && res.data.jobCategory!==''){
+ state.jobCategoryArr = res.data.jobCategory.split(',')
+ }else{
+ state.jobCategoryArr = []
+ }
}
- console.log('11',state.dataForm)
state.loading = false;
}else{
ElMessage.warning(res.message)
@@ -208,14 +323,17 @@
const validKey=(key,obj)=>{
return key in obj
}
-const handleAvatarSuccess = (res, uploadFile) => {
+const handleAvatarSuccess = async (res, uploadFile) => {
if(res.code == 200){
- state.fileList = res.data.map(i=>{
+
+ state.fileList = state.fileList.map(item => {
return {
- name: i.originName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
+ name: item.name,
+ originalFileName: item.name,
+ filePath: item.response.url,
+ fileName:item.response.fileName,
+ projectId: state.projectId,
+ module: 1
}
})
}else{
@@ -226,6 +344,24 @@
})
}
}
+const getFile = async () =>{
+ const param = {
+ projectId: state.projectId,
+ module: 1
+ }
+ const res = await getFileInfo(param);
+ if(res.code == 200){
+ state.fileList = res.data.map(item => {
+ return {
+ ...item,
+ name: item.originalFileName
+ }
+ })
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+
const showTip =()=>{
ElMessage({
@@ -235,17 +371,17 @@
}
const picSize = async (rawFile) => {
- if(rawFile.size / 1024 / 1024 > 5){
+ if(rawFile.size / 1024 / 1024 > 15){
ElMessage({
type: 'warning',
- message: '文件大小不能超过5M'
+ message: '文件大小不能超过15M'
});
return false
}
};
const handlePictureCardPreview = (uploadFile) => {
- axios.get(uploadFile.url,{headers:{'Content-Type': 'application/json','Authorization': `${getToken()}`,'uid':`${Cookies.get('uid')}`},responseType: 'blob'}).then(res=>{
+ axios.get(uploadFile.filePath,{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})
@@ -262,51 +398,42 @@
};
const handleRemove = async (file, uploadFile) => {
- if(file && file.status == 'success') {
- ElMessageBox.confirm(
- '确定删除该附件？',
- '提示',
- {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(async () => {
- state.fileList = []
- // const res = await delFile(file.id)
- // if (res.code == 200) {
- // ElMessage({
- // type: 'success',
- // message: '文件已删除'
- // })
- // } else {
- // ElMessage({
- // type: 'warning',
- // message: res.message
- // })
- // }
- })
- .catch(() => {
- })
- }
}
-const templatePath = '/example.docx';
+const templatePath = '/example.docx'
const startGeneration = async () => {
const data = state.dataForm
- data.companyName = data.companyName != '' ? data.companyName: '-'
- data.projectCheckTime = data.projectCheckTime != '' ? data.projectCheckTime: '-'
+ let day = new Date(data.projectDateEnd).getTime() - new Date(data.projectDateStart).getTime();
+ let dayCount = Math.floor(day / 86400000) + 1;
+ data.planTime = moment(data.projectDateStart).format('YYYY年MM月DD日') + ' 至 ' + moment(data.projectDateEnd).format('YYYY年MM月DD日') +'，'+`共计${dayCount}天。`
+
+ // state.jobCategoryArr.forEach(item => {
+ // let checked
+ // const val = state.directionList.find(i => i.value === item)
+ // typeList.push(val)
+ // })
+ state.directionList.forEach(item => {
+ if(state.jobCategoryArr.some(i => i === item.value)){
+ item.checked = false
+ }else {
+ item.checked = true
+ }
+ })
+ console.log('xx',state.directionList)
+ data.typeList = state.directionList
+
data.tableData = state.dataList.map(item => {
return {
...item,
- ratingLevel: item.ratingLevel == 1 ? '一级' : item.ratingLevel == 2 ? '二级':item.ratingLevel == 3 ? '三级' : '',
- sex: item.sex == 0 ? '男' : '女',
- selectionMode: item.selectionMode == 1 ? '固定' : '随机',
- teamLeader: item.teamLeader == 1 ? '是' : '否',
+ selectionTime: item.selectionTime ? moment(item.selectionTime).format('YYYY年MM月DD日 HH:mm:ss') : '--',
+ expertRemark: item.expertRemark ? item.expertRemark : ''
}
})
+ data.expertNum = data.tableData.length
+ data.isInside = '是'
+ console.log('dataList',state.dataList,data.expertNum)
try {
- generateWordDocument(templatePath, data);
+ generateWordDocument(templatePath, data, '专家选用审批单.docx');
} catch (error){
ElMessage({
type: 'warning',
--
Gitblit v1.9.2