From 3dc3d79e10232c821db66a952341b2daae80e0e1 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 16 十二月 2025 17:17:47 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectReview/components/editDialog.vue | 496 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 469 insertions(+), 27 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectReview/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectReview/components/editDialog.vue
index a1b5687..fa1cc75 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectReview/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectReview/components/editDialog.vue
@@ -3,13 +3,14 @@
<el-dialog
v-model="dialogVisible"
:title="state.title"
- width="600px"
+ width="1090px"
:before-close="handleClose"
:close-on-press-escape="false"
+ :key="`select_${Date.now()}`"
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
- <el-form-item label="企业名称:" prop="companyId" v-if="state.isAdmin">
+ <el-form-item label="单位名称:" prop="companyId" v-if="state.isAdmin">
<el-select v-model="state.form.companyId" filterable placeholder="请选择" @change="changeCom" clearable style="width: 100%" :disabled="state.title == '查看' || state.title == '编辑' || !state.isAdmin">
<el-option
v-for="item in state.companyList"
@@ -24,6 +25,8 @@
filterable
placeholder="请选择"
clearable style="width: 100%"
+ @change="changeItem"
+ :disabled="state.title == '查看'"
>
<el-option
v-for="item in state.projectList"
@@ -32,22 +35,232 @@
:value="item.id">
</el-option>
</el-select>
+ </el-form-item>
+ <el-row :gutter="24">
+ <el-col :span="24">
+ <el-form-item label="类型:" prop="type">
+ <el-radio-group v-model="state.form.type" :disabled="state.title =='查看' || state.title =='编辑'" @change="changeType">
+ <el-radio :label="1">会签评审</el-radio>
+ <el-radio :label="2">会议评审</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 线下-->
+ <div v-if="state.form.type == 2">
+ <el-form-item label="设计和开发阶段:" prop="stage">
+ <el-input v-model.trim="state.form.stage" :disabled="state.title =='查看'" placeholder="设计和开发阶段"></el-input>
+ </el-form-item>
+ <el-form-item label="文件名称:" prop="fileName">
+ <el-input v-model.trim="state.form.fileName" :disabled="state.title =='查看'" placeholder="文件名称"></el-input>
+ </el-form-item>
+ <el-form-item label="文件:" prop="filePath">
+ <el-upload accept=".doc,.docx,.pdf,.png,.jpg,.jpeg" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
+ <el-button type="primary">点击上传</el-button>
+ <template #tip>
+ <div class="el-upload__tip">支持上传.doc、.docx、.pdf、图片格式文档，尺寸小于30M，最多可上传1份</div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </div>
- </el-form-item>
- <el-form-item label="文件编号:" prop="num">
- <el-input v-model.trim="state.form.num" :disabled="state.title =='查看'" placeholder="文件编号"></el-input>
- </el-form-item>
- <el-form-item label="文件名称:" prop="fileName">
- <el-input v-model.trim="state.form.fileName" :disabled="state.title =='查看'" placeholder="文件名称"></el-input>
- </el-form-item>
- <el-form-item label="文件:" prop="filePath">
- <el-upload accept=".doc,.docx,.pdf,.png,.jpg,.jpeg" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
- <el-button type="primary">点击上传</el-button>
- <template #tip>
- <div class="el-upload__tip">支持上传.doc、.docx、.pdf、图片格式文档，尺寸小于30M，最多可上传1份</div>
- </template>
- </el-upload>
- </el-form-item>
+ <!-- 线上-->
+ <div v-if="state.form.type == 1">
+ <el-row :gutter="24">
+ <el-col :span="12">
+ <el-form-item label="项目代码:" prop="projectCode">
+ <el-input v-model.trim="state.form.projectCode" :disabled="state.title =='查看'" placeholder="项目代码"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="编号:">
+ <el-input v-model.trim="state.form.projectNum" :disabled="state.title =='查看'" placeholder="编号"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="12">
+ <el-form-item label="设计和开发阶段:" prop="stage">
+ <el-input v-model.trim="state.form.stage" :disabled="state.title =='查看'" placeholder="设计和开发阶段"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="评审级别:" prop="reviewLevel">
+ <el-input v-model.trim="state.form.reviewLevel" :disabled="state.title =='查看'" placeholder="评审级别"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="12">
+ <el-form-item label="评审文件:" required>
+ <el-select
+ clearable
+ multiple
+ v-model="state.productItems"
+ :disabled="state.title =='查看'"
+ filterable
+ @change="changeFile"
+ value-key="id"
+ style="width: 100%">
+ <el-option
+ v-for="item in state.itemFileList"
+ :key="item.id"
+ :label="item.fileName"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="24">
+ <el-form-item label="评审内容:" prop="reviewContent">
+ <el-input v-model.trim="state.form.reviewContent" type="textarea" :rows="4" :disabled="state.title =='查看'" placeholder="评审内容"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+<!-- <el-row :gutter="24">-->
+<!-- <el-col :span="24">-->
+<!-- <el-form-item label="评审意见:" prop="reviewOpinion">-->
+<!-- <el-input v-model.trim="state.form.reviewOpinion" type="textarea" :rows="4" :disabled="state.title =='查看'" placeholder="评审意见"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row :gutter="24">-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="评审组长:" prop="groupId">-->
+<!-- <el-select clearable v-model="state.form.groupId" :disabled="state.title =='查看'" filterable style="width: 100%">-->
+<!-- <el-option-->
+<!-- v-for="item in state.peopleList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.name"-->
+<!-- :value="item.id"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="日期:" prop="groupTime">-->
+<!-- <el-date-picker-->
+<!-- :disabled="state.title === '查看'"-->
+<!-- v-model="state.form.groupTime"-->
+<!-- type="date"-->
+<!-- placeholder="请选择日期"-->
+<!-- value-format="YYYY-MM-DD"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row :gutter="24">-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="批准领导:" prop="leaderId">-->
+<!-- <el-select clearable v-model="state.form.leaderId" :disabled="state.title =='查看'" filterable style="width: 100%">-->
+<!-- <el-option-->
+<!-- v-for="item in state.peopleList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.name"-->
+<!-- :value="item.id"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="日期:" prop="leaderTime">-->
+<!-- <el-date-picker-->
+<!-- :disabled="state.title === '查看'"-->
+<!-- v-model="state.form.leaderTime"-->
+<!-- type="date"-->
+<!-- placeholder="请选择日期"-->
+<!-- value-format="YYYY-MM-DD"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+ <el-row :gutter="24">
+ <el-col :span="24">
+ <el-form-item required label= "合同评审人员签署:" >
+ <el-button
+ :disabled="state.title === '查看'"
+ style="margin-bottom: 5px"
+ type="primary"
+ @click="addObject"
+ >新增</el-button>
+ <div style="display: flex;width: 100%;margin-top: 5px">
+ <el-table :data="state.form.reviewUsers" :border="true">
+ <el-table-column type="index" label="序号" width="60" align="center"></el-table-column>
+ <el-table-column label="评审组" align="center" width="130" >
+ <template #default="{row,$index}">
+ <el-form-item :prop="'reviewUsers.' + '[' + $index + ']' + '.reviewType'" :rules="state.rules.reviewType">
+ <el-select clearable v-model="row.reviewType" :disabled="state.title =='查看'" filterable style="width: 245px">
+ <el-option
+ v-for="item in state.reviewTypeList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ />
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="姓名" align="center" width="110">
+ <template #default="{row,$index}">
+ <el-form-item :prop="'reviewUsers.' + '[' + $index + ']' + '.reviewUserId'" :rules="state.rules.reviewUserId">
+ <el-select clearable v-model="row.reviewUserId" :disabled="state.title =='查看'" filterable style="width: 245px" @change="chooseUser($index,row.reviewUserId)">
+ <el-option
+ v-for="item in state.studentList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="userDept" label="单位/部门" align="center"></el-table-column>
+ <el-table-column prop="userDuty" label="职务/职称" align="center"></el-table-column>
+ <el-table-column prop="status" label="状态" align="center">
+ <template #default="{row,$index}">
+ <div>{{row.status == 1 ? '待发送':row.status == 2 ? '待审批': row.status == 3? '已审批':''}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="reviewOpinion" label="评审意见" align="center">
+ <template #default="{row,$index}">
+ <div>{{row.reviewOpinion == 1 ? '同意':row.reviewOpinion == 2 ? '不同意':''}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="reviewTime" label="评审日期" width="110" align="center"></el-table-column>
+ <el-table-column prop="sign" label="签名" align="center" width="120">
+ <template #default="{row,$index}">
+ <el-form-item :prop="'reviewUsers.' + '[' + $index + ']' + '.sign'">
+ <div v-if="row.sign ">
+ <el-image
+ style="width: 100px; height: 100%"
+ :src= "row.sign ? row.sign[0] : '' "
+ :zoom-rate="1.2"
+ :max-scale="7"
+ :min-scale="0.2"
+ :preview-src-list="row.sign ? row.sign : '' "
+ :initial-index="0"
+ fit="cover"
+ :preview-teleported=true
+ />
+ </div>
+ <div v-else></div>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="state.title !== '查看'" >
+ <template #default="scope" >
+ <el-button link type="danger" @click="handleDelete(scope.row)" >删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ </div>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
</el-form>
<template #footer v-if="state.title !='查看'">
<span class="dialog-footer">
@@ -61,16 +274,23 @@
<script setup>
import {reactive, ref, toRefs, defineEmits, nextTick, onMounted} from 'vue'
import {ElMessage} from "element-plus";
-import {addUser, editUser, getUserById, resetPwd} from "@/api/onlineEducation/user"
+import {addUser, editUser, getUser, getUserById, resetPwd} from "@/api/onlineEducation/user"
import {Base64} from "js-base64"
import {getCompany} from "@/api/onlineEducation/company";
import {addIndustryTemp, updateIndustryTemp, updateInfoPlatforms} from "@/api/staffManage/staff";
import {getToken} from "@/utils/auth";
import {delPic} from "@/api/onlineEducation/banner";
import {addFile, editFile} from "@/api/qualityManage/range";
-import {addProductFile, editProductFile, getProductSet} from "@/api/selfProblems/productFile";
+import {
+ addProductFile,
+ editProductFile,
+ getProductFileList,
+ getProductFilePage,
+ getProductSet
+} from "@/api/selfProblems/productFile";
import Cookies from "js-cookie";
import {addReview, editReview} from "@/api/selfProblems/projectReview";
+import {getStudent} from "@/api/onlineEducation/student";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -79,23 +299,53 @@
title: '',
form: {
id: null,
- name: '',
filePath: '',
fileName: '',
companyId: null,
- num: '',
- itemId: null
+ itemId: null,
+ stage: '',
+ reviewUsers:[],
+ type: 1,
+ projectCode: "",
+ projectNum: "",
+ reviewLevel: "",
+ reviewBasis: "",
+ reviewContent: "",
+ reviewOpinion: "",
+ groupId: null,
+ groupTime: "",
+ leaderId: null,
+ leaderTime: "",
+ productItemIds: null,
+ processItemIds:null
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
- num: [{ required: true, message: '请输入文件编号', trigger: 'blur' }],
fileName: [{ required: true, message: '请输入文件名称', trigger: 'blur' }],
filePath: [{ required: true, message: '请上传文件', trigger: 'blur' }],
itemId: [{ required: true, message: '请选择项目', trigger: 'blur' }],
+ type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
+ stage: [{ required: true, message: '请输入设计开发阶段', trigger: 'blur' }],
+ projectCode: [{ required: true, message: '请输入项目代码', trigger: 'blur' }],
+ projectNum: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
+ reviewLevel: [{ required: true, message: '请输入评审级别', trigger: 'blur' }],
+ reviewBasis: [{ required: true, message: '请输入评审文件', trigger: 'blur' }],
+ reviewContent: [{ required: true, message: '请输入评审内容', trigger: 'blur' }],
+ reviewOpinion: [{ required: true, message: '请输入评审意见', trigger: 'blur' }],
+ groupId: [{ required: true, message: '请选择评审组长', trigger: 'blur' }],
+ groupTime: [{ required: true, message: '请选择时间', trigger: 'blur' }],
+ leaderId: [{ required: true, message: '请选择评审领导', trigger: 'blur' }],
+ leaderTime: [{ required: true, message: '请选择时间', trigger: 'blur' }],
+ // productItemIds: [{ required: true, message: '请选择项目文件', trigger: 'blur' }],
+ },
+ rules:{
+ reviewUserId: [{ required: true, message: '', trigger: 'blur' }],
+ reviewType: [{ required: true, message: '', trigger: 'blur' }],
},
isAdmin: false,
companyList: [],
industryList: [],
+ itemFileList: [],
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
header: {
Authorization: getToken()
@@ -104,6 +354,21 @@
fileList: [],
projectList: [],
userId: null,
+ peopleList: [],
+ studentList: [],
+ reviewTypeList: [
+ {
+ id: 1,
+ name: '评审组长'
+ },
+ {
+ id: 2,
+ name: '评审组员'
+ },
+ ],
+ productItems:[],
+ paojectDocuments:[],
+ processInspections:[]
})
onMounted(() => {
@@ -125,6 +390,12 @@
state.form[key] = value[key]
}
})
+ await nextTick();
+
+
+ const productItemIdList = state.form.productItemIds ?state.form.productItemIds.split(',').map(item => Number(item)):[]
+ const processItemIdList = state.form.processItemIds?state.form.processItemIds.split(',').map(item => Number(item)):[]
+ state.productItems = productItemIdList.concat(processItemIdList)
if(value.filePath) {
const obj = {
url: value.filePath,
@@ -133,8 +404,18 @@
state.fileList = [obj]
}
state.form.itemId = state.form.itemId == 0 ? null : state.form.itemId
+ const list = JSON.parse(JSON.stringify(value.reviewUsers))
+ list.forEach(item => {
+
+ item.sign = item.sign ? [import.meta.env.VITE_APP_BASE_API + '/' + item.sign] :[]
+ })
+ state.form.reviewUsers = list
+
}
await getProjectList()
+ await getPeopleList()
+ await getStudentList()
+ await getFileList()
dialogVisible.value = true
}
const getProjectList = async () => {
@@ -152,10 +433,51 @@
}
}
+const getStudentList = async () => {
+ if (state.isAdmin && !state.form.companyId && (state.form.companyId == 0 || state.form.companyId == null)) {
+ return
+ }
+ const queryParams = {
+ pageNum: 1,
+ pageSize: 9999,
+ companyId: state.form.companyId
+ }
+ const res = await getStudent(queryParams)
+ if (res.code == 200) {
+ state.studentList = res.data.list ? res.data.list : []
+ } else {
+ ElMessage.warning(res.message)
+ }
+}
+const getPeopleList = async ()=> {
+ if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+ return
+ }
+ const queryParams = {
+ pageNum: 1,
+ pageSize: 9999,
+ companyId: state.form.companyId
+ }
+ const res = await getUser(queryParams)
+ if(res.code == 200){
+ state.peopleList = res.data.list?res.data.list:[]
+ }else{
+ ElMessage.warning(res.message)
+ }
+};
const onSubmit = async () => {
+ // state.form.productItemIds = state.productItems.join(',')
const valid = await superRef.value.validate();
if(valid){
+ if(!state.form.processItemIds && !state.form.productItemIds){
+ ElMessage.warning('请选择评审文件')
+ return
+ }
+ if(state.form.type == 1 && state.form.reviewUsers && state.form.reviewUsers.length == 0){
+ ElMessage.warning('请填写合同评审人员签署表')
+ return
+ }
if(state.title == '新增'){
const {id,...data} = state.form
const res = await addReview(data)
@@ -235,23 +557,143 @@
const handleClose = () => {
state.form = {
id: null,
- name: '',
filePath: '',
fileName: '',
companyId: null,
- num: '',
- itemId: null
+ itemId: null,
+ stage: '',
+ reviewUsers:[],
+ type: 1,
+ projectCode: "",
+ projectNum: "",
+ reviewLevel: "",
+ reviewBasis: "",
+ reviewContent: "",
+ reviewOpinion: "",
+ groupId: null,
+ groupTime: "",
+ leaderId: null,
+ leaderTime: "",
+ productItemIds: null,
+ processItemIds:null
}
state.fileList = []
+ state.peopleList = []
+ state.productItems = []
+ state.paojectDocuments=[]
+ state.processInspections=[]
superRef.value.clearValidate();
superRef.value.resetFields()
dialogVisible.value = false;
}
const changeCom = () => {
- state.form.itemId = []
+ state.form.itemId = null
+ state.form.productItemIds = null
+ state.form.processItemIds = null
+ state.productItems = []
+ state.form.reviewUsers.forEach(item => {
+ item.reviewUserId = null
+ item.userDept = ''
+ item.userDuty = ''
+ })
getProjectList()
+ getPeopleList()
+ getStudentList()
+ getFileList()
}
+const changeItem = () => {
+ state.form.productItemIds = null
+ state.form.processItemIds = null
+ state.productItems = []
+ getFileList()
+}
+const getFileList = async () => {
+ if (state.isAdmin && !state.form.companyId && (state.form.companyId == 0 || state.form.companyId == null)) {
+ return
+ }
+ const queryParams = {
+ companyId: state.form.companyId,
+ itemId: state.form.itemId,
+ }
+ const res = await getProductFileList(queryParams)
+ if (res.code == 200) {
+ state.paojectDocuments = res.data.data.paojectDocuments.map(item => {
+ return {
+ ...item,
+ flag:1
+ }
+ })
+ state.processInspections = res.data.data.processInspections.map(item => {
+ return {
+ ...item,
+ flag:2
+ }
+ })
+ state.itemFileList = state.paojectDocuments.concat(state.processInspections)
+ // state.itemFileList = res.data.list.map(item => {
+ // return {
+ // ...item,
+ // fileNameSimple: item.fileName.split('.')[0]
+ // }
+ // })
+ } else {
+ ElMessage.warning(res.message)
+ }
+}
+const changeType = () => {
+ if(state.form.type == 2){
+ state.form.stage = ''
+ state.form.reviewUsers = []
+ state.form.projectCode = ''
+ state.form.projectNum = ''
+ state.form.reviewLevel = ''
+ state.form.reviewBasis = ''
+ state.form.reviewContent = ''
+ state.form.reviewOpinion = ''
+ state.form.groupId = null
+ state.form.groupTime = null
+ state.form.leaderId = null
+ state.form.leaderTime = null
+ state.form.productItemIds = null
+ state.form.processItemIds = null
+
+ state.productItems = []
+ }else if(state.form.type == 1){
+ state.form.stage = ''
+ state.form.fileName = ''
+ state.form.filePath = ''
+ state.fileList = []
+ }
+
+
+}
+
+const addObject = () => {
+ state.form.reviewUsers.push({reviewUserId:null})
+}
+const handleDelete = (val) => {
+ state.form.reviewUsers = state.form.reviewUsers.filter(item=> item != val)
+}
+const chooseUser = (index,id) =>{
+ const obj = state.studentList.filter(item => item.id == id)
+ state.form.reviewUsers[index].userDept = obj[0].deptName
+ state.form.reviewUsers[index].userDuty = obj[0].duty
+
+}
+const changeFile = (ids) => {
+ state.form.productItemIds = ids.filter(id => {
+ const item = state.itemFileList.find(i => i.id === id);
+ return item?.flag === 1;
+ });
+ state.form.productItemIds = state.form.productItemIds.join(',')
+
+ state.form.processItemIds = ids.filter(id => {
+ const item = state.itemFileList.find(i => i.id === id);
+ return item?.flag === 2;
+ });
+ state.form.processItemIds = state.form.processItemIds.join(',')
+}
defineExpose({
openDialog
--
Gitblit v1.9.2