From 7786e561f165ae3045cc070063cbeaebba6f1ff0 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期四, 20 十一月 2025 17:27:52 +0800
Subject: [PATCH] 修改
---
src/views/safetyReview/projectManage/components/chooseExpert.vue | 578 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 503 insertions(+), 75 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/chooseExpert.vue b/src/views/safetyReview/projectManage/components/chooseExpert.vue
index d0face4..ce9b9f3 100644
--- a/src/views/safetyReview/projectManage/components/chooseExpert.vue
+++ b/src/views/safetyReview/projectManage/components/chooseExpert.vue
@@ -1,9 +1,29 @@
<template>
<div class="expertChoose">
<div style="margin-bottom: 50px">
+ <div style="display: flex;align-items: center">
+ <span style="font-weight: 600">选用专家总人数：</span>
+ <el-input
+ clearable
+ v-model.trim="queryParams.num"
+ placeholder="请输入专家总人数"
+ style="width: 150px;"
+ @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,'')"
+ :disabled="!state.isAble || state.newProgress >=3 "
+
+ >
+ </el-input>
+ </div>
<div class="fTop">
- <span style="font-weight: 600">固定选用部分</span>
- <el-button type="primary" style="width: 100px" @click="chooseExpert('选取专家')">选取专家</el-button>
+ <div style="font-size: 16px;display: flex;align-items: center">
+ 专家组组长
+ <el-icon style="margin-left: 10px;margin-right: 4px;margin-top: 2px;color: #FE8E8A"><InfoFilled /></el-icon>
+ <span style="font-size: 14px;color: #FE8E8A">仅专家组组长允许固定选取，仅允许固定选取1人</span>
+ </div>
+ <div>
+ <el-button type="primary" :disabled="state.info.step == 4 || state.isAdmin" style="width: 120px;margin-bottom: 10px" @click="chooseExpert('选取专家')">选取专家组组长</el-button>
+ <el-button type="primary" :disabled="state.info.step == 4 || state.isAdmin" style="width: 120px;margin-bottom: 10px" @click="addOutExpertLeader">填报库外专家</el-button>
+ </div>
</div>
<el-table v-loading="fLoading" :data="fixedDataList" :border="true" ref="fTableRef" style="width: 100%;">
<el-table-column label="姓名" prop="name" align="center" />
@@ -15,19 +35,23 @@
<el-table-column label="身份证号" prop="idCard" align="center" />
<el-table-column label="等级" prop="ratingLevel" align="center" >
<template #default="scope">
- <span>{{scope.row.ratingLevel == 1 ?'一级':scope.row.ratingLevel == 1?'二级':'三级'}}</span>
+ <span>{{scope.row.ratingLevel == 1 ?'一级':scope.row.ratingLevel == 1?'二级':scope.row.ratingLevel == 3?'三级':scope.row.ratingLevel == 10?'库外':''}}</span>
</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="delF(scope.row)" >删除</el-button>
+ <el-button link type="primary" @click="delF(scope.row)" :disabled="state.info.step == 4 || state.isAdmin">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div style="display: flex;flex-direction: column">
- <span style="font-weight: 600">随机选用部分</span>
+ <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>
+ </div>
<el-form :model="queryParams" ref="queryForm" :inline="true" style="margin-top: 10px" label-width="90px">
<el-row :gutter="24">
<el-col :span="8">
@@ -36,7 +60,7 @@
style="width: 100%"
v-model="expertType"
:options="domainList"
- :props="{ expandTrigger: 'hover',value: 'id',label: 'classifyName',multiple: true }"
+ :props="{ expandTrigger: 'hover',value: 'classifyName',label: 'classifyName',multiple: true }"
@change="professionChange"
collapse-tags
collapse-tags-tooltip
@@ -47,32 +71,42 @@
</el-col>
<el-col :span="8">
<el-form-item label="允许级别:">
- <el-checkbox-group v-model="queryParams.ratingLevel">
+ <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;">
- <el-button style="width: 100px;margin-right: -32px;" type="primary" @click="random">随机抽取</el-button>
- </el-form-item>
+ <div style="display: flex;align-items: center;justify-content: flex-end">
+ <div style="float: right;" v-if=" state.newProgress < 3 && state.isAble && Number(queryParams.num) !=1 && queryParams.num!=''">
+ <el-button style="width: 100px;margin-bottom: 20px;margin-right: 10px" :disabled="state.info.step == 4 || state.isAdmin" type="primary" @click="random">随机抽取</el-button>
+ </div>
+ <el-button type="primary" :disabled="state.info.step == 4 || state.isAdmin" style="width: 120px;margin-bottom: 20px" @click="addOutExpertLists">填报库外专家</el-button>
+ </div>
</el-col>
</el-row>
- <el-row :gutter="24">
- <el-col :span="24">
- <el-form-item label="拟选用人数:">
- <el-input
- clearable
- v-model.trim="queryParams.num"
- placeholder="请输入拟选用人数"
- @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,' ')"
- >
- </el-input>
- </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="拟选用人数:">-->
+<!-- <el-input-->
+<!-- clearable-->
+<!-- v-model.trim="queryParams.num"-->
+<!-- placeholder="请输入拟选用人数"-->
+<!-- @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,' ')"-->
+<!-- >-->
+<!-- </el-input>-->
+<!-- </el-form-item>-->
+<!-- </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">
@@ -82,49 +116,60 @@
<el-table-column label="身份证号" prop="idCard" align="center" />
<el-table-column label="等级" prop="ratingLevel" align="center" >
<template #default="scope">
- <span>{{scope.row.ratingLevel == 1 ?'一级':scope.row.ratingLevel == 1?'二级':'三级'}}</span>
+ <span>{{scope.row.ratingLevel == 1 ?'一级':scope.row.ratingLevel == 1?'二级':scope.row.ratingLevel == 3?'三级':scope.row.ratingLevel == 10?'库外':''}}</span>
</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)" >删除</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>
+ <out-expert ref="outRef" @getList="getOutItem"></out-expert>
</div>
</template>
<script setup>
-import {onMounted, reactive, ref} from "vue";
+import {onMounted, onUnmounted, reactive, ref, watch} from "vue";
import expertsList from './expertsList.vue'
import {getExpertTypes} from "@/api/form";
import {ElMessage} from "element-plus";
-import {addProject, choose, expertRound, getCheckInfo} from "@/api/projectManage";
+import {addProject, choose, expertRound, getCheckInfo, getProjectInfo} from "@/api/projectManage";
+import Cookies from "js-cookie";
+import outExpert from './addOutExpertDialog.vue'
const emit = defineEmits(["getNextStatus"]);
const fTableRef = ref(null);
+const outRef = ref(null);
const expertsListRef = ref(null)
const fLoading = ref(false);
const rLoading = ref(false);
const fixedDataList = ref([]);
const rTableRef = ref(null);
const randomDataList = ref([]);
-const queryParams = ref({
+const queryParams = reactive({
+ num: null,
+ ratingLevel: [],
+ domain: null
})
const expertType = ref([])
const checkList = ref([])
const domainList = ref([])
+const prop = defineProps(['projectId','newProgress'])
const state = reactive({
formData: {
id:null,
step: 2,
saveData: [],
- delData: []
+ delData: [],
+ saveOutData: [],
+ delOutData: []
},
+ info: {},
levelList: [
{
id: 1,
@@ -138,41 +183,204 @@
id: 3,
name: '三级'
},
- ]
+ ],
+ isAdmin: false,
+ projectId: null,
+ newProgress: null,
+ randomNum:0,
+ isAble: true
+})
+const choosedRandomList = ref([])
+const userInfo = ref()
+onMounted(async () =>{
+ // localStorage.removeItem('numData')
+ // localStorage.removeItem('fixedDataList')
+ // localStorage.removeItem('randomNum')
+
+ if(prop.projectId){
+ state.projectId = prop.projectId
+ await getProjectProcess()
+ }
+ const fixListData = localStorage.getItem('fixedDataList');
+ let fixDataArr = []
+ if(fixListData){
+ fixDataArr = JSON.parse(fixListData)
+ fixDataArr.forEach(item => {
+ if(item.projectId == state.projectId){
+ fixedDataList.value = [item.fixedData]
+ const uniqueItem = fixedDataList.value.find(itemA =>
+ !itemA.id && !state.formData.saveOutData.some(itemB => itemB.name === itemA.name)
+ );
+ if(uniqueItem){
+ state.formData.saveOutData.push(uniqueItem)
+ }
+ }
+ })
+ }
+ const rondomData = localStorage.getItem('randomDataList');
+ let rondomDataArr = []
+ if(rondomData){
+ rondomDataArr = JSON.parse(rondomData)
+ rondomDataArr.forEach(item => {
+ if(item.projectId == state.projectId){
+ randomDataList.value = item.rondomData
+ const uniqueItem = randomDataList.value.find(itemA =>
+ !itemA.id && !state.formData.saveOutData.some(itemB => itemB.name === itemA.name)
+ );
+ if(uniqueItem){
+ state.formData.saveOutData.push(uniqueItem)
+ }
+ }
+ })
+ }
+ const numData = localStorage.getItem('numData')
+ let numDataArr = []
+ if(numData){
+ numDataArr = JSON.parse(numData)
+ numDataArr.forEach(item => {
+ if(item.projectId == state.projectId){
+ queryParams.num = item.num
+ }
+ })
+ }
+ const randomNumData = localStorage.getItem('randomNum')
+ let randomNumArr = []
+ if(randomNumData){
+ randomNumArr = JSON.parse(randomNumData)
+ randomNumArr.forEach(item => {
+ if(item.projectId == state.projectId){
+ state.randomNum = Number(item.randomNum)
+ }
+ })
+ }
+ if(state.randomNum == 3){
+ state.isAble = false
+ }
+ userInfo.value = JSON.parse(Cookies.get('userInfo'))
+ state.isAdmin = userInfo.value.admin
+ await getDomain()
})
+const getProjectProcess = async () => {
+ const res = await getProjectInfo(state.projectId)
+ if(res.code === 200) {
+ state.newProgress = res.data.step
+ }else {
+ ElMessage.warning(res.message)
+ }
+}
-onMounted(() =>{
- getDomain()
-})
-const riskOpen = async (type,val) => {
- console.log("type",type,val)
- if(type === 'add' || type === 'clickEdit'){
- if(fixedDataList.value.length === 0 && randomDataList.value.length === 0){
- ElMessage.warning('请选择专家')
- return;
+watch(()=> fixedDataList.value,(newVal)=> {
+ if(newVal && newVal.length>0){
+ const data = {
+ projectId :state.projectId,
+ fixedData: newVal[0]
+ }
+ if(state.newProgress < 2){
+
+ saveObjectToLocalStorage('fixedDataList',data)
}
}
+})
+watch(()=> randomDataList.value,(newVal)=> {
+ if(newVal && newVal.length>0){
+ const data = {
+ projectId :state.projectId,
+ rondomData: newVal
+ }
+ if(state.newProgress < 2){
+ saveObjectToLocalStorage('randomDataList',data)
+ }
+
+ }
+})
+watch(()=> queryParams.num,(newVal)=> {
+ if(newVal){
+ const data = {
+ projectId :state.projectId,
+ num: newVal
+ }
+ if(state.newProgress < 2){
+ saveObjectToLocalStorage('numData',data)
+ }
+
+ }
+})
+
+const saveObjectToLocalStorage = (key, newObj) => {
+ const storedData = localStorage.getItem(key);
+ let dataArray = [];
+ if (storedData) {
+ try {
+ dataArray = JSON.parse(storedData);
+ } catch (e) {
+ console.error('数据解析失败，重置为空数组');
+ }
+ }
+ const index = dataArray.findIndex(obj => obj.projectId == newObj.projectId)
+ if(index !== -1){
+ dataArray[index] = newObj
+ }else {
+ dataArray.push(newObj);
+ }
+ // 将数组转为字符串并存储到 localStorage
+ localStorage.setItem(key, JSON.stringify(dataArray));
+}
+
+const typeNow = ref('')
+const firstRandomList = ref([])
+const riskOpen = async (type,val) => {
+ typeNow.value = type
+ console.log("type",type,val)
+ state.projectId = val
+ await getProjectProcess()
+ if(type === 'add' || type === 'clickEdit'){
+ if (state.isAdmin) {
+ ElMessage.warning("当前用户暂无权限");
+ return;
+ }
+ if(fixedDataList.value.length === 0){
+ ElMessage.warning('请选择专家组组长')
+ return;
+ }
+ // if(randomDataList.value.length < Number(queryParams.num)-1){
+ // ElMessage.warning('请随机抽取专家')
+ // return;
+ // }
+ }
+
+
//保存按钮
if(type === 'add'){
+ // choosedRandomList.value = randomDataList.value
let fData = []
let rData = []
//成功后自动到下一步 项目id
const {...data} = state.formData
data.id = val
+
if(fixedDataList.value && fixedDataList.value.length > 0){
fData = fixedDataList.value.map(item => {
return {
expertId: item.id,
expertName:item.name,
selectionMode: 1,
- teamLeader: 0
+ teamLeader: 1
}
})
}
- if(randomDataList.value && randomDataList.value.length > 0){
- rData = randomDataList.value.map(item => {
+
+ if(choosedRandomList.value && choosedRandomList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可选取${Number(queryParams.num) - 1}名随机专家`);
+ return
+ }
+ 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,
@@ -181,35 +389,67 @@
}
})
}
+ fData = fData.filter(i => i.expertId)
+ rData = rData.filter(i => i.expertId)
+ const chooseIds = choosedRandomList.value.map(i => i.id)
+ const x = randomDataList.value.filter(i => !chooseIds.includes(i.id))
+ x.forEach(i => {
+ if(i.expertType == 1 && i.expertId){
+ data.delData.push(i.id)
+ }else if(i.expertType == 2 ){
+ if( i.id){
+ data.delOutData.push(i.id)
+ data.saveOutData = data.saveOutData.filter(f => f.id != i.id)
+ }else {
+ data.saveOutData = data.saveOutData.filter(f => f != i)
+ }
+ }
+ })
data.saveData = fData.concat(rData)
+ data.saveOutData.forEach(item => {
+ item.projectId = state.projectId
+ })
const res = await choose(data);
if(res.code == 200){
ElMessage.success('新增成功')
emit('getNextStatus', val);
+ removeLocal()
// reset()
}else{
ElMessage.warning(res.message)
}
}else if(type === 'clickEdit'){
+ // choosedRandomList.value = randomDataList.value
let fData = []
let rData = []
const {...data} = state.formData
data.id = val
+
if(fixedDataList.value && fixedDataList.value.length > 0){
fData = fixedDataList.value.map(item => {
return {
+ ...item,
id: item.expertId ? item.id : '',
expertId: item.expertId ? item.expertId : item.id,
expertName:item.name,
selectionMode: 1,
- teamLeader: 0
+ teamLeader: 1,
}
})
}
- if(randomDataList.value && randomDataList.value.length > 0){
- rData = randomDataList.value.map(item => {
+ if(choosedRandomList.value && choosedRandomList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可选取${Number(queryParams.num) - 1}名随机专家`);
+ return
+ }
+ 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 {
+ ...item,
id: item.expertId ? item.id : '',
expertId: item.expertId ? item.expertId : item.id,
expertName:item.name,
@@ -218,7 +458,30 @@
}
})
}
+ fData = fData.filter(i => i.expertType == 1)
+ rData = rData.filter(i => i.expertType == 1)
+ console.log('randon',randomDataList.value)
+ console.log('choodse',choosedRandomList.value)
+ const chooseIds = choosedRandomList.value.map(i => i.id)
+ const x = randomDataList.value.filter(i => !chooseIds.includes(i.id))
+ x.forEach(i => {
+ if(i.expertType == 1 && i.expertId){
+ data.delData.push(i.id)
+ }else if(i.expertType == 2 ){
+ if( i.id){
+ data.delOutData.push(i.id)
+ data.saveOutData = data.saveOutData.filter(f => f.id != i.id)
+ }else {
+ data.saveOutData = data.saveOutData.filter(f => f != i)
+ }
+ }
+ })
+
data.saveData = fData.concat(rData)
+ data.saveOutData.forEach(item => {
+ item.projectId = state.projectId
+ })
+
const res = await choose(data);
if(res.code == 200){
ElMessage.success('修改成功')
@@ -234,7 +497,14 @@
if(res.code == 200){
fixedDataList.value = res.data.projectExpertCheckResp.filter(item => item.selectionMode === 1)
randomDataList.value = res.data.projectExpertCheckResp.filter(item => item.selectionMode === 2)
+ firstRandomList.value = res.data.projectExpertCheckResp.filter(item => item.selectionMode === 2)
+ const fdata = fixedDataList.value.filter(i => i.expertType == 2)
+ const rdata = randomDataList.value.filter(i => i.expertType == 2)
+ state.info = res.data
+ state.formData.saveOutData = fdata.concat(rdata)
console.log('res',fixedDataList.value)
+ queryParams.num = res.data.expertNum
+ removeLocal()
}else{
ElMessage.warning(res.message)
}
@@ -242,27 +512,112 @@
}
const chooseExpert = (type) => {
+ if(fixedDataList.value && fixedDataList.value.length >0){
+ ElMessage.warning('仅允许选择1位组长')
+ return
+ }
expertsListRef.value.openDialog(type,fixedDataList.value,domainList.value)
}
+
+const removeLocal = () => {
+ const fData = localStorage.getItem('fixedDataList');
+ const rData = localStorage.getItem('randomDataList')
+ const nData = localStorage.getItem('numData')
+ const rnData = localStorage.getItem('randomNum')
+ let fDataArray = [];
+ let rDataArray = []
+ let nDataArray = []
+ let rnDataArray = []
+ if (fData) {
+ try {
+ fDataArray = JSON.parse(fData);
+ } catch (e) {
+ console.error('数据解析失败，重置为空数组');
+ }
+ }
+ const index = fDataArray.findIndex(obj => obj.projectId == state.projectId)
+ if(index !== -1){
+ fDataArray.splice(index,1)
+ }
+ localStorage.setItem('fixedDataList', JSON.stringify(fDataArray));
+
+ if (rData) {
+ try {
+ rDataArray = JSON.parse(rData);
+ } catch (e) {
+ console.error('数据解析失败，重置为空数组');
+ }
+ }
+ const indexR = rDataArray.findIndex(obj => obj.projectId == state.projectId)
+ if(indexR !== -1){
+ rDataArray.splice(indexR,1)
+ }
+ localStorage.setItem('randomDataList', JSON.stringify(rDataArray));
+
+ if (nData) {
+ try {
+ nDataArray = JSON.parse(nData);
+ } catch (e) {
+ console.error('数据解析失败，重置为空数组');
+ }
+ }
+ const indexN = nDataArray.findIndex(obj => obj.projectId == state.projectId)
+ if(indexN !== -1){
+ nDataArray.splice(indexN,1)
+ }
+ localStorage.setItem('numData', JSON.stringify(nDataArray));
+
+ // if (rnData) {
+ // try {
+ // rnDataArray = JSON.parse(rnData);
+ // } catch (e) {
+ // console.error('数据解析失败，重置为空数组');
+ // }
+ // }
+ // const indexRN = rnDataArray.findIndex(obj => obj.projectId == state.projectId)
+ // if(indexRN !== -1){
+ // rnDataArray.splice(indexRN,1)
+ // }
+ // localStorage.setItem('randomNum', JSON.stringify(rnDataArray));
+}
+const handleSelectionChange = (val) => {
+ choosedRandomList.value = val
+}
+
const getSelected = (type,data)=>{
+ data[0].expertType = 1
+
const selectData = JSON.parse(JSON.stringify(data))
- if(fixedDataList.value && fixedDataList.value.length > 0){
- fixedDataList.value.forEach(item => {
- if(item.expertId){
- selectData.forEach((i,index) => {
- if(i.id == item.expertId){
- selectData[index] = item
- }
- })
- }
- })
+ // if(fixedDataList.value && fixedDataList.value.length > 0){
+ // fixedDataList.value.forEach(item => {
+ // if(item.expertId){
+ // selectData.forEach((i,index) => {
+ // if(i.id == item.expertId){
+ // selectData[index] = item
+ // }
+ // })
+ // }
+ // })
+ // }
+ if(fixedDataList.value && fixedDataList.value.length >0){
+ state.formData.delData.push(fixedDataList.value[0].id)
}
fixedDataList.value = selectData
}
const delF = (val) => {
- if(val.expertId){
- state.formData.delData.push(val.id)
+ //库外
+ if(val.expertType == 2){
+ if(val.expertId){
+ state.formData.delOutData.push(val.id)
+ }
+ state.formData.saveOutData = state.formData.saveOutData.filter(i => i.idCard != val.idCard)
+ }else{
+ //库内
+ if(val.expertId){
+ state.formData.delData.push(val.id)
+ }
}
+
fixedDataList.value = fixedDataList.value.filter(item => item.id != val.id)
}
@@ -270,10 +625,18 @@
if(val.expertId){
state.formData.delData.push(val.id)
}
- randomDataList.value = randomDataList.value.filter(item => item.id != val.id)
+ const arr = randomDataList.value.filter(item => item.id != val.id)
+ if(arr.length < queryParams.num-1){
+ ElMessage.warning(`随机专家数不能低于${queryParams.num-1}人`)
+ return
+ }else {
+ randomDataList.value = arr
+ }
+
+
}
const professionChange=(value)=> {
- queryParams.value.domain = value.map(item => item[1])
+ queryParams.domain = value.map(item => item[1])
}
const getDomain = async () => {
const res = await getExpertTypes()
@@ -285,24 +648,89 @@
}
const random = async () => {
- console.log('11',randomDataList.value)
- randomDataList.value.forEach(item => {
- if(item.expertId){
- state.formData.delData.push(item.id)
- }
- })
- if(queryParams.value.num =='' || queryParams.value.num == undefined){
- ElMessage.warning('拟选用人数不能为空')
+ console.log('first',firstRandomList.value)
+ firstRandomList.value.forEach(item => {
+ if(item.expertId && item.expertType == 1){
+ state.formData.delData.push(item.id)
+ }
+ })
+ if(fixedDataList.value && fixedDataList.value.length <= 0){
+ ElMessage.warning('请先选择专家组组长')
+ return
+ }
+ if(queryParams.domain == undefined || (queryParams.domain && queryParams.domain.length == 0)){
+ ElMessage.warning('专业领域不能为空')
+ return
+ }
+ if(queryParams.num =='' || queryParams.num == undefined){
+ ElMessage.warning('选用专家总人数不能为空')
return
}
rLoading.value = true
- const res = await expertRound(queryParams.value)
+ const param = {
+ num: (Number(queryParams.num)-1) * 5,
+ selectedUserId: fixedDataList.value[0].id,
+ domain: queryParams.domain,
+ ratingLevel:queryParams.ratingLevel
+ }
+ const res = await expertRound(param)
if(res.code == 200){
- randomDataList.value = res.data
+ randomDataList.value = []
+ res.data = res.data.map(item => {
+ return{
+ ...item,
+ expertType: 1
+ }
+ })
+ const outLists = state.formData.saveOutData.filter(i => i.teamLeader == 0)
+ if(outLists && outLists.length >0){
+ randomDataList.value = outLists.concat(res.data)
+ }else {
+ randomDataList.value = res.data
+ }
+ state.randomNum = state.randomNum + 1
+ const obj = {
+ projectId: state.projectId,
+ randomNum: state.randomNum
+ }
+ saveObjectToLocalStorage('randomNum',obj)
+ if(state.randomNum == 3){
+ state.isAble = false
+ }
}else{
ElMessage.warning(res.message)
}
rLoading.value = false
+}
+const addOutExpertLeader = () => {
+ if(fixedDataList.value.length>0){
+ ElMessage.warning('仅允许选取1名专家组长')
+ return;
+ }
+ outRef.value.openDialog('leader')
+}
+const addOutExpertLists = () => {
+ outRef.value.openDialog('')
+}
+
+const getOutItem = (val) => {
+ console.log('val',val)
+ val.expertType = 2
+ if(val.teamLeader == 1){
+ fixedDataList.value.push(val)
+ const data = {
+ projectId :state.projectId,
+ fixedData: val
+ }
+ if(state.newProgress < 2){
+ saveObjectToLocalStorage('fixedDataList',data)
+ }
+ }else {
+ // choosedRandomList.value.push(val)
+ randomDataList.value.push(val)
+ }
+ state.formData.saveOutData.push(val)
+
}
defineExpose({
@@ -319,7 +747,7 @@
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 15px;
+ margin-bottom: 0px;
}
}
--
Gitblit v1.9.2