From 8bb3b6048c7cb68a94cf92bfd2f2480fb58e3ffd Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 19 十一月 2025 09:48:26 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectReview/components/editDialog.vue | 198 +++++++++++++++++++++++++++----------------------
1 files changed, 108 insertions(+), 90 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 6f85f56..4384a70 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="980px"
+ 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"
@@ -90,80 +91,15 @@
</el-col>
</el-row>
<el-row :gutter="24">
- <el-col :span="24">
- <el-form-item label="评审依据:" prop="reviewBasis">
- <el-input v-model.trim="state.form.reviewBasis" 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="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 label="项目文件:" prop="productItemId">
- <el-select clearable v-model="state.form.productItemId" :disabled="state.title =='查看'" filterable style="width: 308px">
+ <el-form-item label="评审文件:" prop="productItemIds">
+ <el-select
+ clearable
+ multiple
+ v-model="state.productItems"
+ :disabled="state.title =='查看'"
+ filterable
+ style="width: 100%">
<el-option
v-for="item in state.itemFileList"
:key="item.id"
@@ -174,6 +110,70 @@
</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= "合同评审人员签署:" >
@@ -200,7 +200,7 @@
</el-form-item>
</template>
</el-table-column>
- <el-table-column prop="name" label="姓名" align="center">
+ <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)">
@@ -216,6 +216,17 @@
</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'">
@@ -234,11 +245,6 @@
</div>
<div v-else></div>
</el-form-item>
- </template>
- </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 label="操作" align="center" class-name="small-padding fixed-width" v-if="state.title !== '查看'" >
@@ -302,7 +308,7 @@
groupTime: "",
leaderId: null,
leaderTime: "",
- productItemId: null,
+ productItemIds: null,
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
@@ -314,14 +320,14 @@
projectCode: [{ required: true, message: '请输入项目代码', trigger: 'blur' }],
projectNum: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
reviewLevel: [{ required: true, message: '请输入评审级别', trigger: 'blur' }],
- reviewBasis: [{ 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' }],
- productItemId: [{ required: true, message: '请选择项目文件', trigger: 'blur' }],
+ productItemIds: [{ required: true, message: '请选择项目文件', trigger: 'blur' }],
},
rules:{
reviewUserId: [{ required: true, message: '', trigger: 'blur' }],
@@ -350,7 +356,8 @@
id: 2,
name: '评审组员'
},
- ]
+ ],
+ productItems:[]
})
onMounted(() => {
@@ -372,6 +379,8 @@
state.form[key] = value[key]
}
})
+ await nextTick();
+ state.productItems = state.form.productItemIds.split(',').map(item => Number(item))
if(value.filePath) {
const obj = {
url: value.filePath,
@@ -380,9 +389,13 @@
state.fileList = [obj]
}
state.form.itemId = state.form.itemId == 0 ? null : state.form.itemId
- state.form.reviewUsers.forEach(item => {
+ 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()
@@ -439,6 +452,7 @@
};
const onSubmit = async () => {
+ state.form.productItemIds = state.productItems.join(',')
const valid = await superRef.value.validate();
if(valid){
if(state.form.type == 1 && state.form.reviewUsers && state.form.reviewUsers.length == 0){
@@ -541,17 +555,19 @@
groupTime: "",
leaderId: null,
leaderTime: "",
- productItemId: null,
+ productItemIds: null,
}
state.fileList = []
state.peopleList = []
+ state.productItems = []
superRef.value.clearValidate();
superRef.value.resetFields()
dialogVisible.value = false;
}
const changeCom = () => {
state.form.itemId = null
- state.form.productItemId = null
+ state.form.productItemIds = null
+ state.productItems = []
state.form.reviewUsers.forEach(item => {
item.reviewUserId = null
item.userDept = ''
@@ -564,7 +580,8 @@
}
const changeItem = () => {
- state.form.productItemId = null
+ state.form.productItemIds = null
+ state.productItems = []
getFileList()
}
const getFileList = async () => {
@@ -604,7 +621,8 @@
state.form.groupTime = null
state.form.leaderId = null
state.form.leaderTime = null
- state.form.productItemId = null
+ state.form.productItemIds = null
+ state.productItems = []
}else if(state.form.type == 1){
state.form.stage = ''
state.form.fileName = ''
--
Gitblit v1.9.2