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/chooseExpert.vue | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/chooseExpert.vue b/src/views/safetyReview/projectManage/components/chooseExpert.vue
index 04ae93a..2b8af6e 100644
--- a/src/views/safetyReview/projectManage/components/chooseExpert.vue
+++ b/src/views/safetyReview/projectManage/components/chooseExpert.vue
@@ -8,7 +8,7 @@
v-model.trim="queryParams.num"
placeholder="请输入专家总人数"
style="width: 150px;"
- @input="queryParams.num = queryParams.num.replace(/[^1-9]/g,'')"
+ @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,'')"
:disabled="!state.isAble || state.newProgress >=3 "
>
@@ -47,7 +47,7 @@
<div style="display: flex;align-items: center">
<span style="font-weight: 600">随机选用部分</span>
<el-icon style="margin-left: 10px;margin-right: 4px;margin-top: 2px;color: #FE8E8A"><InfoFilled /></el-icon>
- <span style="font-size: 14px;color: #FE8E8A">随机人数为 {{queryParams.num-1}} 的5倍，可根据实际情况删除至 {{queryParams.num-1}} 人</span>
+ <span style="font-size: 14px;color: #FE8E8A">随机人数为 {{queryParams.num-1}} 的5倍，可根据实际情况选取{{queryParams.num-1}} 人</span>
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" style="margin-top: 10px" label-width="90px">
<el-row :gutter="24">
@@ -71,14 +71,20 @@
<el-checkbox-group v-model="queryParams.ratingLevel" >
<el-checkbox v-for="item in state.levelList" :label="item.id" :key="item.id">{{ item.name }}</el-checkbox>
</el-checkbox-group>
+
</el-form-item>
</el-col>
+
<el-col :span="8">
<el-form-item style="float: right;" v-if=" state.newProgress < 3 && state.isAble && Number(queryParams.num) !=1 && queryParams.num!=''">
<el-button style="width: 100px;margin-right: -32px;" :disabled="state.info.step == 4 || state.isAdmin" type="primary" @click="random">随机抽取</el-button>
</el-form-item>
</el-col>
</el-row>
+ <div style="display: flex;align-items: center;justify-content: flex-end;margin-top: -15px;margin-bottom: 10px" v-if="state.newProgress < 3">
+ <el-icon style="margin-left: 10px;margin-right: 4px;color: #FE8E8A"><InfoFilled /></el-icon>
+ <span style="font-size: 14px;color: #FE8E8A">最多可随机3次，剩余{{3-state.randomNum}}次</span>
+ </div>
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="拟选用人数:">-->
@@ -93,7 +99,8 @@
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
- <el-table v-loading="rLoading" :data="randomDataList" :border="true" ref="rTableRef" style="width: 100%;">
+ <el-table v-loading="rLoading" :data="randomDataList" :border="true" ref="rTableRef" style="width: 100%;" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" />
<el-table-column label="姓名" prop="name" align="center" />
<el-table-column label="性别" prop="sex" align="center" >
<template #default="scope">
@@ -107,11 +114,11 @@
</template>
</el-table-column>
<el-table-column label="专业领域" prop="domain" align="center" />
- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
- <template #default="scope">
- <el-button link type="primary" @click="delR(scope.row)" :disabled="state.info.step == 4 || state.isAdmin">删除</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" @click="delR(scope.row)" :disabled="state.info.step == 4 || state.isAdmin">删除</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
<experts-list ref="expertsListRef" @getName="getSelected"></experts-list>
@@ -172,7 +179,7 @@
randomNum:0,
isAble: true
})
-
+const choosedRandomList = ref([])
const userInfo = ref()
onMounted(async () =>{
// localStorage.removeItem('numData')
@@ -335,14 +342,16 @@
})
}
-
-
- if(randomDataList.value && randomDataList.value.length > Number(queryParams.num) - 1){
- ElMessage.warning(`仅可保留${Number(queryParams.num) - 1}名随机专家`);
+ if(choosedRandomList.value && choosedRandomList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可选取${Number(queryParams.num) - 1}名随机专家`);
return
}
- if(randomDataList.value && randomDataList.value.length > 0){
- rData = randomDataList.value.map(item => {
+ if(choosedRandomList.value.length < Number(queryParams.num) - 1){
+ ElMessage.warning(`随机专家数不能低于${Number(queryParams.num) - 1}人`)
+ return
+ }
+ if(choosedRandomList.value && choosedRandomList.value.length > 0){
+ rData = choosedRandomList.value.map(item => {
return {
expertId: item.id,
expertName:item.name,
@@ -378,15 +387,18 @@
}
})
}
- if(randomDataList.value && randomDataList.value.length > Number(queryParams.num) - 1){
- ElMessage.warning(`仅可保留${Number(queryParams.num) - 1}名随机专家`);
+ if(choosedRandomList.value && choosedRandomList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可选取${Number(queryParams.num) - 1}名随机专家`);
return
}
- if(randomDataList.value && randomDataList.value.length > 0){
- rData = randomDataList.value.map(item => {
+ if(choosedRandomList.value.length < Number(queryParams.num) - 1){
+ ElMessage.warning(`随机专家数不能低于${Number(queryParams.num) - 1}人`)
+ return
+ }
+ if(choosedRandomList.value && choosedRandomList.value.length > 0){
+ rData = choosedRandomList.value.map(item => {
return {
- id: item.expertId ? item.id : '',
- expertId: item.expertId ? item.expertId : item.id,
+ expertId: item.id,
expertName:item.name,
selectionMode: 2,
teamLeader: 0
@@ -488,6 +500,9 @@
// }
// localStorage.setItem('randomNum', JSON.stringify(rnDataArray));
}
+const handleSelectionChange = (val) => {
+ choosedRandomList.value = val
+}
const getSelected = (type,data)=>{
const selectData = JSON.parse(JSON.stringify(data))
--
Gitblit v1.9.2