From 63d315600f35200be81e78af7e30fc36cc62a051 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 21 三月 2025 17:25:45 +0800
Subject: [PATCH] 修改bug
---
src/views/safetyReview/projectManage/components/projectApproval.vue | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 110 insertions(+), 39 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/projectApproval.vue b/src/views/safetyReview/projectManage/components/projectApproval.vue
index 8836e82..1dc4936 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>
@@ -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" :disabled="state.dataForm.state == 2" v-if="scope.row.teamLeader === 1" @click="scope.row.teamLeader = 0">取消组长</el-button>
- <el-button link type="primary" :disabled="state.dataForm.state == 2" 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"
@@ -84,7 +86,7 @@
<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>
@@ -107,6 +109,8 @@
import axios from "axios";
import {generateWordDocument} from "@/views/safetyReview/projectManage/components/exportWord";
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()
@@ -123,6 +127,7 @@
projectCheckTime: '',
state: ''
},
+ jobCategoryArr: [],
queryParams: {
pageNum: 1,
pageSize: 20,
@@ -135,15 +140,41 @@
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)
@@ -153,21 +184,36 @@
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 {
- const data = {
- id: state.projectId,
- step: 3,
- saveData: state.dataList
- }
- const res = await choose(data);
- if(res.code == 200){
- dialogVisible.value = true
- }else{
- ElMessage.warning(res.message)
- }
+ 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'){
//查看审批单
@@ -232,7 +278,8 @@
state.dataList = res.data.projectExpertCheckResp.map(item => {
return {
...item,
- teamLeader: item.teamLeader ? item.teamLeader : 0
+ teamLeader: item.teamLeader ? item.teamLeader : 0,
+ expertName: item.name
}
})
if(res.data) {
@@ -243,6 +290,11 @@
}
}
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 = []
+ }
}
state.loading = false;
}else{
@@ -258,6 +310,7 @@
state.fileList = state.fileList.map(item => {
return {
name: item.name,
+ originalFileName: item.name,
filePath: item.response.url,
fileName:item.response.fileName,
projectId: state.projectId,
@@ -299,10 +352,10 @@
}
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
}
@@ -328,22 +381,40 @@
const handleRemove = async (file, uploadFile) => {
}
-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