From 0d5f2c20521598c01bc2a2d6376ab564b5effc2a Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 10 十二月 2024 08:54:59 +0800
Subject: [PATCH] 修改bug
---
src/views/safetyReview/expertManage/experts/index.vue | 265 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 231 insertions(+), 34 deletions(-)
diff --git a/src/views/safetyReview/expertManage/experts/index.vue b/src/views/safetyReview/expertManage/experts/index.vue
index ff3e984..96e2638 100644
--- a/src/views/safetyReview/expertManage/experts/index.vue
+++ b/src/views/safetyReview/expertManage/experts/index.vue
@@ -1,11 +1,18 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="姓名">
+ <el-input v-model.trim="queryParams.name" placeholder="请输入姓名"></el-input>
+ </el-form-item>
+ <el-form-item label="身份证号">
+ <el-input v-model.trim="queryParams.idCard" placeholder="请输入身份证号"></el-input>
+ </el-form-item>
<el-form-item label="专业类别">
<el-cascader
- v-model="classiFy"
+ clearable
+ v-model="queryParams.domain"
:options="expertTypes"
- :props="{ expandTrigger: 'hover', value: 'id',label: 'classifyName'}"
+ :props="{ expandTrigger: 'hover', value: 'classifyName',label: 'classifyName',emitPath: false}"
@change="handleChange"></el-cascader>
</el-form-item>
<el-form-item label="在岗情况" prop="dutyStatus">
@@ -25,31 +32,73 @@
value-format="YYYY-MM-DD"
/>
</el-form-item>
+ <el-form-item label="评定级别">
+ <el-radio-group v-model="queryParams.ratingLevel">
+ <el-radio-button label="1">一级</el-radio-button>
+ <el-radio-button label="2">二级</el-radio-button>
+ <el-radio-button label="3">三级</el-radio-button>
+ </el-radio-group>
+ </el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+ <el-button icon="Edit" @click="openSetDate">一键设置有效期</el-button>
</el-form-item>
</el-form>
- <el-table v-loading="loading" :data="expertList" :border="true">
- <el-table-column type="index" width="55" align="center" />
+ <el-table v-loading="loading" ref="multipleTableRef" :data="expertList" :border="true" @selection-change="handleSelectionChange" :row-key="(row) => { return row.id }">
+ <el-table-column type="selection" width="55" :reserve-selection="true"/>
+ <el-table-column type="index" width="55" align="center" label="序号"/>
<el-table-column label="姓名" align="center" prop="name" />
- <el-table-column label="出生日期" align="center" prop="birthday" />
+ <el-table-column label="身份证号" align="center" prop="idCard" />
+ <el-table-column label="出生日期" align="center" prop="birthday">
+ <template #default="scope">
+ {{scope.row.birthday.slice(0,10)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="性别" align="center" prop="sex" >
+ <template #default="scope">
+ <span>{{scope.row.sex === 0 ? '男' : '女'}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="学历" align="center" prop="degree" />
+ <el-table-column label="所学专业" align="center" prop="speciality" />
<el-table-column label="职称" align="center" prop="title"/>
- <el-table-column label="专业" align="center" prop="speciality" />
- <el-table-column label="推荐类别组别" align="center">
+ <el-table-column label="在岗情况" align="center" prop="dutyStatus" >
<template #default="scope">
- {{findNodeById(expertTypes,scope.row.bigClassify)}}/{{findNodeById(expertTypes,scope.row.smallClassify)}}
+ <span>{{scope.row.dutyStatus === 0 ? '在岗' : '退休'}}</span>
</template>
</el-table-column>
- <el-table-column label="联系电话" align="center" prop="phone"/>
- <el-table-column label="申请时间" align="center" prop="createTime">
+ <el-table-column label="单位全称" align="center" prop="companyName"/>
+ <el-table-column label="现从事专业及方向" align="center" prop="currentProfession"/>
+ <el-table-column label="联系方式" align="center" prop="phone"/>
+ <el-table-column label="支撑方向" align="center">
<template #default="scope">
- {{scope.row.createTime?scope.row.createTime.substring(0,10):''}}
+ {{ getSupport(scope.row.supportDirectionSafety, scope.row.supportDirectionPrevention, scope.row.supportDirectionEmergency) }}
+<!-- directionList-->
</template>
</el-table-column>
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="专家领域" align="center" prop="domain"/>
+<!-- <el-table-column label="入库分级" align="center" prop="level"/>-->
+ <el-table-column label="评定级别" align="center" prop="ratingLevel">
<template #default="scope">
+ {{scope.row.ratingLevel == 1?'一级':scope.row.ratingLevel == 2?'二级':scope.row.ratingLevel == 3?'三级':'--'}}
+ </template>
+ </el-table-column>
+ <el-table-column label="聘书有效时间" align="center" prop="">
+ <template #default="scope">
+ <span v-if="scope.row.state == 2">{{scope.row.employmentDateStart}}/{{scope.row.employmentDateEnd}}</span>
+ <span v-else>--</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="专家聘书" align="center" prop="expertCertificate">
+ <template #default="scope">
+ <span v-if="scope.row.state == 2"><el-button type="primary" link @click="viewCert(scope.row)">查看</el-button></span>
+ <span v-else>--</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-button type="primary" link @click="openDialog('edit',scope.row)">编辑</el-button>
<el-button type="primary" link @click="openDialog('view',scope.row)">查看</el-button>
</template>
</el-table-column>
@@ -61,6 +110,31 @@
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
+ <el-dialog
+ v-model="assessDialog"
+ title="修改有效期"
+ width="50%"
+ :before-close="closeAssess"
+ >
+ <el-form :model="assessForm" :rules="assessRules" ref="assessFormRef" label-width="200px">
+ <el-form-item label="专家聘用期限" prop="employTime">
+ <el-date-picker
+ v-model="assessForm.employTime"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="closeAssess" size="default">取 消</el-button>
+ <el-button type="primary" @click="assessSubmit(assessFormRef)" size="default" v-preReClick>确认</el-button>
+ </span>
+ </template>
+ </el-dialog>
<expert-form ref="expertFormRef" @getList="getList"></expert-form>
</div>
</template>
@@ -69,33 +143,67 @@
import {getCurrentInstance, onMounted, onUnmounted, reactive, ref, toRefs} from "vue";
import {ElMessage, ElMessageBox} from "element-plus";
import ExpertForm from "../applyRecords/components/expertForm";
-import {delExpert, getExpertsList, getExpertTypes} from "../../../../api/form";
-import { Plus } from '@element-plus/icons-vue'
+import {changeApprove, changeEmploymentDate, delExpert, getExpertsList, getExpertTypes} from "../../../../api/form";
+import {useRouter} from "vue-router";
+const router = useRouter();
+const loading = ref(false)
-const loading = ref(false);
const data = reactive({
showSearch: true,
total: 0,
expertTypes: [],
expertList: [],
queryParams: {
+ name: '',
pageNum: 1,
pageSize: 10,
- state: 2,
- bigClassify: null,
- smallClassify: null,
- dutyStatus: null,
+ idCard: '',
+ dutyStatus: '',
+ domain: '',
+ ratingLevel: null,
params: {
startTime: '',
endTime: ''
}
},
classiFy: [],
- searchTime: []
+ searchTime: [],
+ directionList: [
+ {
+ value: '1',
+ label: '现场检查'
+ },
+ {
+ value: '2',
+ label: '调查评估'
+ },
+ {
+ value: '3',
+ label: '咨询服务'
+ },
+ {
+ value: '4',
+ label: '教育培训'
+ },
+ {
+ value: '5',
+ label: '其他'
+ }
+ ],
+ multipleSelection: [],
+ assessDialog: false,
+ assessForm: {
+ employTime: []
+ },
+ assessRules: {
+ employTime:[{ required: true, message: '请选择有效期', trigger: 'blur' }],
+ }
});
-const { showSearch,total, expertTypes,expertList,queryParams,classiFy,searchTime} = toRefs(data);
+const { showSearch,total, expertTypes,expertList,queryParams,searchTime,assessForm,assessDialog,assessRules,multipleSelection} = toRefs(data);
const expertFormRef = ref()
+const assessFormRef = ref()
+const multipleTableRef = ref()
onMounted(()=>{
getList()
getTypes()
@@ -104,6 +212,10 @@
onUnmounted(()=>{
})
+
+const handleSelectionChange = (val) => {
+ data.multipleSelection = val
+}
const getTypes = async()=> {
const res = await getExpertTypes()
@@ -115,10 +227,17 @@
}
const handleChange=(value)=> {
- console.log(value)
+ if(!value){
+ data.classiFy = []
+ data.queryParams.bigClassify = ""
+ data.queryParams.smallClassify = ""
+ }
}
const changeTime=(value)=>{
- console.log(value)
+ if(!value){
+ data.queryParams.params.endTime = ""
+ data.queryParams.params.startTime = ""
+ }
}
const findNodeById = (data,value)=> {
@@ -136,13 +255,44 @@
return null;
}
+const viewCert=(info)=>{
+ console.log(info,'info')
+ const routePath = '/certPdf'
+ const resolvedRoute = router.resolve(routePath)
+ const queryString = new URLSearchParams(info).toString()
+ const fullPath = `${resolvedRoute.href}?${queryString}`
+ window.open(fullPath, '_blank')
+}
+
+const getSupport =(safety,prevention,emergency)=>{
+ let str = []
+ let safeArr = safety?.split(',')
+ let preventArr = prevention?.split(',')
+ let emergencyArr = emergency?.split(',')
+ if(Array.isArray(safeArr) && !safeArr.includes("")){
+ safeArr = safeArr.map(i=>{
+ return data.directionList.find(item=>item.value == i)?.label
+ })
+ str.push(`安全生产（${safeArr.join('、')}）`)
+ }
+ if(Array.isArray(preventArr) && !preventArr.includes("")){
+ preventArr = preventArr.map(i=>{
+ return data.directionList.find(item=>item.value == i)?.label
+ })
+ str.push(`防灾减灾（${preventArr.join('、')}）`)
+ }
+ if(Array.isArray(emergencyArr) && !emergencyArr.includes("")){
+ emergencyArr = emergencyArr.map(i=>{
+ return data.directionList.find(item=>item.value == i)?.label
+ })
+ str.push(`应急救援（${emergencyArr.join('、')}）`)
+ }
+ return str.join('，')
+}
+
const handleQuery=()=> {
data.queryParams.pageNum = 1
- if(data.classiFy.length>0){
- data.queryParams.bigClassify = data.classiFy[0]
- data.queryParams.smallClassify = data.classiFy[1]
- }
- if(data.searchTime.length>0){
+ if(data.searchTime && data.searchTime.length>0){
data.queryParams.params.startTime = data.searchTime[0]
data.queryParams.params.endTime = data.searchTime[1]
}
@@ -153,8 +303,8 @@
loading.value = true;
const res = await getExpertsList(data.queryParams)
if(res.code == 200){
- data.expertList = res.data.list
- data.total = res.data.total
+ data.expertList = res.rows
+ data.total = res.total
}else{
ElMessage.warning(res.msg)
}
@@ -165,14 +315,61 @@
expertFormRef.value.openDialog(type, value);
}
+const openSetDate = ()=>{
+ if(data.multipleSelection.length>0){
+ data.assessDialog = true
+ }else{
+ ElMessage.warning('请选择要设置的人员')
+ }
+}
+
+const assessSubmit = async (formEl)=> {
+ if (!formEl) return
+ await formEl.validate(async (valid, fields) => {
+ if (valid) {
+ let params = {
+ id: data.multipleSelection.map(i=>i.id),
+ employmentDateStart: data.assessForm.employTime[0],
+ employmentDateEnd: data.assessForm.employTime[1]
+ }
+ const res = await changeEmploymentDate(params)
+ if(res.code == 200){
+ ElMessage({
+ type: 'success',
+ message: '修改成功'
+ })
+ data.multipleSelection = []
+ multipleTableRef.value.clearSelection()
+ await getList()
+ data.assessDialog = false
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.msg
+ });
+ }
+ }else {
+ ElMessage.warning('请完善必填信息')
+ }
+ })
+}
+
+const closeAssess = ()=>{
+ assessFormRef.value.clearValidate()
+ data.assessForm = {
+ employTime: []
+ }
+ data.assessDialog = false;
+}
const resetQuery=()=> {
data.queryParams = {
+ name: '',
pageNum: 1,
pageSize: 10,
- state: 2,
- bigClassify: null,
- smallClassify: null,
- dutyStatus: null,
+ idCard: '',
+ dutyStatus: '',
+ domain: '',
+ ratingLevel: null,
params: {
startTime: '',
endTime: ''
--
Gitblit v1.9.2