From 25988ffefd8448c6ea770489b77c89a07d00190d Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 09 八月 2024 16:10:12 +0800 Subject: [PATCH] bug修改 --- src/views/safetyReview/expertManage/experts/index.vue | 52 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/views/safetyReview/expertManage/experts/index.vue b/src/views/safetyReview/expertManage/experts/index.vue index ff3e984..f5a582d 100644 --- a/src/views/safetyReview/expertManage/experts/index.vue +++ b/src/views/safetyReview/expertManage/experts/index.vue @@ -1,8 +1,12 @@ <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="queryParams.name" placeholder="请输入姓名"></el-input> + </el-form-item> <el-form-item label="专业类别"> <el-cascader + clearable v-model="classiFy" :options="expertTypes" :props="{ expandTrigger: 'hover', value: 'id',label: 'classifyName'}" @@ -33,21 +37,27 @@ <el-table v-loading="loading" :data="expertList" :border="true"> <el-table-column type="index" width="55" align="center" /> <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="birthdayName" /> + <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"> - <template #default="scope"> - {{scope.row.createTime?scope.row.createTime.substring(0,10):''}} - </template> - </el-table-column> + <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" prop="supportDirectionSafety"/> + <el-table-column label="专家领域" align="center" prop="domain"/> + <el-table-column label="入库分级" align="center" prop="level"/> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template #default="scope"> <el-button type="primary" link @click="openDialog('view',scope.row)">查看</el-button> @@ -115,10 +125,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)=> { @@ -138,11 +155,11 @@ const handleQuery=()=> { data.queryParams.pageNum = 1 - if(data.classiFy.length>0){ + if(data.classiFy && 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,7 +170,12 @@ loading.value = true; const res = await getExpertsList(data.queryParams) if(res.code == 200){ - data.expertList = res.data.list + data.expertList = res.data.list.map(item => { + return{ + ...item, + birthdayName: item.birthday ? item.birthday.slice(0,10) : '' + } + }) data.total = res.data.total }else{ ElMessage.warning(res.msg) -- Gitblit v1.9.2