From 137910cf4fc73a3a2787a3a02718f1e1f637c368 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 14 六月 2024 16:01:17 +0800 Subject: [PATCH] bug修改 --- src/views/safetyReview/userManage/expertUsers/index.vue | 188 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 170 insertions(+), 18 deletions(-) diff --git a/src/views/safetyReview/userManage/expertUsers/index.vue b/src/views/safetyReview/userManage/expertUsers/index.vue index ab11d71..4279d1b 100644 --- a/src/views/safetyReview/userManage/expertUsers/index.vue +++ b/src/views/safetyReview/userManage/expertUsers/index.vue @@ -9,16 +9,56 @@ >新增</el-button> </div> <div style="margin-top: 15px;margin-bottom: 15px;"> - <el-radio-group v-model="queryParams.expertType" @change="changeType"> + <el-radio-group v-model="queryParams.expertType"> <el-radio-button label="">全部</el-radio-button> <el-radio-button label="1">安全评价</el-radio-button> <el-radio-button label="2">检验检测</el-radio-button> </el-radio-group> + + </div> + <div style="margin-bottom: 20px"><span style="font-size: 16px;color: #ed5565;">提示:疆外企业无需上传社保、医保、工资清单,疆内企业需每季度进行更新。</span></div> + <div style="margin-bottom: 15px; display: flex;align-items: center"> + <el-input + v-model="queryParams.name" + placeholder="姓名" + style="width: 220px;margin-right: 12px" + /> + <el-input + v-model="queryParams.phone" + placeholder="手机号" + style="width: 220px;margin-right: 12px" + /> + <el-select v-model="queryParams.level" style="width: 220px;margin-right: 12px" placeholder="评价师等级" > + <el-option + v-for="item in levelList" + :key="item.id" + :label="item.name" + :value="item.name" + /> + </el-select> + <el-select v-model="queryParams.major" value-key="id" style="width: 220px;margin-right: 12px" placeholder="专业方向"> + <el-option + v-for="item in majorList" + :key="item.id" + :label="item.label" + :value="item.id" + /> + </el-select> + <el-select v-model="queryParams.post" style="width: 220px;margin-right: 12px" placeholder="请选择职务"> + <el-option + v-for="item in postList" + :key="item.id" + :label="item.name" + :value="item.name" + /> + </el-select> + <el-button type="primary" icon="Filter" @click="search">查询</el-button> + <el-button type="primary" icon="Filter" @click="research">重置</el-button> </div> <!-- 表格数据 --> <el-table v-loading="loading" :data="dataList" :border="true"> - <el-table-column label="用户ID" prop="id" align="center" /> + <el-table-column label="序号" type="index" align="center" width="60" /> <el-table-column label="姓名" prop="name" align="center" width="110" /> <el-table-column label="手机号" prop="phone" align="center" width="125" /> <el-table-column label="用户名" prop="username" align="center" width="110" /> @@ -41,7 +81,7 @@ :preview-src-list="scope.row.socialAttach" :initial-index="0" fit="cover" - preview-teleported="true" + :preview-teleported=true /> </div> </template> @@ -58,7 +98,7 @@ :preview-src-list="scope.row.medicalAttach" :initial-index="0" fit="cover" - preview-teleported="true" + :preview-teleported=true /> </div> </template> @@ -75,17 +115,40 @@ :preview-src-list="scope.row.salaryAttach" :initial-index="0" fit="cover" - preview-teleported="true" + :preview-teleported=true /> </div> </template> </el-table-column> + <el-table-column label="证件照" prop="idPhoto" align="center" width="120"> + <template #default="scope"> + <div class="demo-image__preview" v-if="scope.row.idPhoto && scope.row.idPhoto.length>0"> + <el-image + style="width: 100px; height: 100px" + :src= "scope.row.idPhoto[0]" + :zoom-rate="1.2" + :max-scale="7" + :min-scale="0.2" + :preview-src-list="scope.row.idPhoto" + :initial-index="0" + fit="cover" + :preview-teleported=true + /> + </div> + </template> + </el-table-column> <el-table-column label="职务" prop="post" align="center" width="120" /> <el-table-column label="职称" prop="jobTitle" align="center" /> <el-table-column label="专业方向" prop="majorNames" align="center" width="100" /> <el-table-column label="评价师等级" prop="level" align="center" width="100" /> - <el-table-column label="业绩汇总" prop="summary" align="center" /> - <el-table-column label="最近评价时间" prop="lastTime" align="center" width="120" /> + <el-table-column label="业绩汇总" prop="summary" align="center"> + <template #default="scope"> + <div style="cursor:pointer;color: #3b82f6;" @click="openList(scope.row)"> + <span>{{scope.row.projectCount}}</span> + </div> + </template> + </el-table-column> + <el-table-column label="最近评价时间" prop="lastEstimateTime" align="center" width="120" /> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140" > <template #default="scope"> <el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button> @@ -102,34 +165,84 @@ v-model:limit="queryParams.pageSize" @pagination="getList" /> - <expert-dialog ref="expertRef" @getList="getList"></expert-dialog> + <project-dialog ref="projectRef" @getList="getList"></project-dialog> + <expert-dialog ref="expertRef" @getList="getList" :majorList="majorList" :levelList="levelList" :postList="postList"></expert-dialog> </div> </template> <script setup> import {getCurrentInstance, onMounted, reactive, ref, toRefs} from "vue"; import expertDialog from "./components/expertDialog.vue" +import {getDictList} from "@/api/backManage/evaluate"; import {ElMessage, ElMessageBox} from "element-plus"; +import projectDialog from "./components/projectDialog.vue"; +import noPic from '@/assets/images/noPic.png' import Cookies from "js-cookie"; import {delMonitor, getExpertList, getMonitorList} from "@/api/sysUsers"; const { proxy } = getCurrentInstance(); const loading = ref(false); const expertRef = ref(); +const projectRef = ref(); const data = reactive({ queryParams: { - pageNum: 1, - pageSize: 10, - expertType: "" + pageNum: 1, + pageSize: 10, + expertType: "", + name: '', + phone: '', + level: '', + major: null, + post: '' }, total: 0, - dataList: [] - - + dataList: [], + majorList: [], + levelList: [ + { + id: '1', + name: '一级' + }, + { + id: '2', + name: '二级' + }, + { + id: '3', + name: '三级' + }, + { + id: '4', + name: '其他' + }, + ], + postList: [ + { + id: '1', + name: '法人' + }, + { + id: '2', + name: '过程控制负责人' + }, + { + id: '3', + name: '机构负责人' + }, + { + id: '4', + name: '技术负责人' + }, + { + id: '5', + name: '员工' + }, + ] }); -const { queryParams, total, dataList } = toRefs(data); +const { queryParams, total, dataList, majorList, levelList, postList } = toRefs(data); onMounted(()=>{ getList() + getMajor() }) const getList = async () => { loading.value = true @@ -138,9 +251,12 @@ data.dataList = res.data.list.map(item => { return{ ...item, - socialAttach: item.socialAttach.map(s => { return import.meta.env.VITE_APP_BASE_API + '/' + s.path}), - medicalAttach: item.medicalAttach.map(s => { return import.meta.env.VITE_APP_BASE_API + '/' + s.path}), - salaryAttach: item.salaryAttach.map(s => { return import.meta.env.VITE_APP_BASE_API + '/' + s.path}) + socialAttach: item.socialAttach.length >0 ?item.socialAttach.map(s => { return import.meta.env.VITE_APP_BASE_API + '/' + s.path}): [noPic], + medicalAttach: item.medicalAttach.length > 0 ?item.medicalAttach.map(s => { return import.meta.env.VITE_APP_BASE_API + '/' + s.path}):[noPic], + salaryAttach: item.salaryAttach.length > 0 ? item.salaryAttach.map(s => { return import.meta.env.VITE_APP_BASE_API + '/' + s.path}):[noPic], + idPhoto: item.idPhoto ? [import.meta.env.VITE_APP_BASE_API + '/' + item.idPhoto ] : [noPic], + lastEstimateTime: item.personProjectVO ? item.personProjectVO.lastEstimateTime.slice(0,10) : '', + projectCount: item.personProjectVO ? item.personProjectVO.projectCount : '' } }) console.log('RES',data.dataList) @@ -151,6 +267,39 @@ loading.value = false } +const getMajor = async () => { + const queryParams = { + pageNum: 1, + pageSize: 50, + dictType: 'sys_major_orientation' + } + const res = await getDictList(queryParams); + if(res.code === 200){ + data.majorList = res.data.list + }else{ + ElMessage.warning(res.message) + } +} + +const search = ()=>{ + data.queryParams.pageNum = 1 + getList() +} + +const research = ()=>{ + data.queryParams = { + pageNum: 1, + pageSize: 10, + expertType: "", + name: '', + phone: '', + level: '', + major: null, + post: '' + } + getList() +} + const openDialog = (type, value) => { expertRef.value.openDialog(type, value); } @@ -160,6 +309,9 @@ queryParams.pageNum = 1; getList(); } +const openList = (val) => { + projectRef.value.openDialog(val); +} /** 重置新增的表单以及其他数据 */ function reset() { -- Gitblit v1.9.2