From 72b79f49a078c089466b54659c106ad2bbc4a807 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 03 Dec 2024 16:28:49 +0800
Subject: [PATCH] 项目管理修改
---
src/views/safetyReview/projectManage/components/projectApproval.vue | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/projectApproval.vue b/src/views/safetyReview/projectManage/components/projectApproval.vue
index 863986d..077e885 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>
@@ -108,6 +110,7 @@
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()
@@ -124,6 +127,7 @@
projectCheckTime: '',
state: ''
},
+ jobCategoryArr: [],
queryParams: {
pageNum: 1,
pageSize: 20,
@@ -137,7 +141,29 @@
},
fileList: [],
projectId: null,
- isAdmin: false
+ isAdmin: false,
+ directionList: [
+ {
+ value: '1',
+ label: '现场检查'
+ },
+ {
+ value: '2',
+ label: '调查评估'
+ },
+ {
+ value: '3',
+ label: '咨询服务'
+ },
+ {
+ value: '4',
+ label: '教育培训'
+ },
+ {
+ value: '5',
+ label: '其他'
+ }
+ ],
});
const projectType = ref('')
const userInfo = ref()
@@ -252,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) {
@@ -263,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{
@@ -352,17 +384,33 @@
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) ;
+ 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 : ''
}
})
+ console.log('dataList',state.dataList)
try {
generateWordDocument(templatePath, data);
} catch (error){
--
Gitblit v1.9.2