From 1b9fea7d4af68d8f933b2dc42bf6084b9646f64c Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期二, 04 三月 2025 08:39:55 +0800 Subject: [PATCH] 修改作业等级名称 --- src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue | 69 +++++++++++++++++++++++++++++++--- 1 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue index d57e4a4..f15e2ad 100644 --- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue +++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue @@ -34,6 +34,13 @@ <el-table :data="scope.row.checkContent" style="width: 100%"> <el-table-column label="序号" type="index" width="150" align="center"> </el-table-column> <el-table-column label="检查内容" prop="checkContent" align="center"> </el-table-column> + <el-table-column label="检查结果" prop="checkResult" align="center"> + <template #default="scope"> + <el-tag :type="scope.row.checkResult === 1 ? 'success' : scope.row.checkResult === 2 ? 'danger' : 'info'"> + {{ parseNumber(scope.row.checkResult, '检查结果') }} + </el-tag> + </template> + </el-table-column> <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width"> <template #default="scope"> <el-button size="small" text type="primary" :icon="View" @click="onOpenDialogRef('查看', scope.row)">查看</el-button> @@ -45,15 +52,30 @@ </el-table-column> <el-table-column type="index" label="序号" width="60" /> <el-table-column prop="taskCode" label="排查名称" show-overflow-tooltip></el-table-column> + <el-table-column prop="execDepId" label="执行部门" show-overflow-tooltip> + <template #default="scope"> + {{ parseNumber(scope.row.execDepId, '执行部门') }} + </template> + </el-table-column> <el-table-column prop="taskStatus" label="状态" show-overflow-tooltip> <template #default="scope"> {{ parseNumber(scope.row.taskStatus, '状态') }} + </template> + </el-table-column> + <el-table-column prop="taskBelong" label="是否认领" show-overflow-tooltip> + <template #default="scope"> + {{ parseNumber(scope.row.taskBelong, '认领状态') }} </template> </el-table-column> <el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column> <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column> <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column> <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip></el-table-column> + <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width"> + <template #default="scope"> + <el-button size="small" text type="primary" v-show="(scope.row.taskStatus === 1 || scope.row.taskStatus === 4) && scope.row.taskBelong === 1" :icon="Check" @click="onHandleTask(scope.row)">任务认领</el-button> + </template> + </el-table-column> </el-table> <br /> <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="recordData.params.pageIndex" background v-model:page-size="recordData.params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="recordData.total" class="page-position"> </el-pagination> @@ -69,7 +91,7 @@ import { ElMessageBox, ElMessage } from 'element-plus'; import recordDialog from './components/recordDialog.vue'; import { recordApi } from '/@/api/doublePreventSystem/record/index.ts'; -import { departmentApi } from '/@/api/department'; +import { departmentApi } from '/@/api/systemManage/department'; import { checkUnitApi } from '/@/api/doublePreventSystem/checkUnit'; import { View, Check } from '@element-plus/icons-vue'; @@ -97,7 +119,9 @@ }; taskUnitList: []; departmentList: Array<DepartmentState>; + departmentRecursionList: Array<DepartmentState>; resultList: Array<levelListState>; + checkResultList: Array<levelListState>; taskStatusList: Array<levelListState>; taskTypeList: Array<levelListState>; } @@ -105,7 +129,10 @@ id: number; name: string; } -interface DepartmentState {} +interface DepartmentState { + depId: number; + depName: string; +} export default defineComponent({ name: 'record', @@ -127,11 +154,17 @@ }, taskUnitList: [], departmentList: [], + departmentRecursionList: [], resultList: [ { id: 1, name: '正常' }, { id: 2, name: '存在隐患' }, { id: 3, name: '未排查' }, { id: 4, name: '其他' } + ], + checkResultList: [ + { id: 1, name: '正常' }, + { id: 2, name: '异常' }, + { id: 3, name: '未处理' } ], taskStatusList: [ { id: 1, name: '待排查' }, @@ -163,6 +196,7 @@ let res = await departmentApi().getDepartmentList(); if (res.data.code === '200') { state.departmentList = res.data.data; + recursion(state.departmentList); } else { ElMessage({ type: 'warning', @@ -188,19 +222,19 @@ recordDialogRef.value.openRecordDialog(type, value); }; // 删除角色 - const onDelRecord = (row: any) => { - ElMessageBox.confirm(`此操作将永久删除该条生产装置:“${row.produceDeviceName}”,是否继续?`, '提示', { + const onHandleTask = (row: any) => { + ElMessageBox.confirm(`此操作将认领该任务:“${row.taskCode}”,是否继续?`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }) .then(async () => { - let res = await recordApi().deleterecord({ id: row.id }); + let res = await recordApi().getTask({ id: row.id }); if (res.data.code === '200') { ElMessage({ type: 'success', duration: 2000, - message: '删除成功' + message: '认领成功' }); await initRecordTableData(); } else { @@ -227,9 +261,30 @@ initRecordTableData(); }; + const recursion = (value: any) => { + for (let i of value) { + if (i.children.length !== 0) { + state.departmentRecursionList.push(i); + recursion(i.children); + } else { + state.departmentRecursionList.push(i); + } + } + }; + const parseNumber = (value: string | number, type: string) => { if (type === '状态') { return state.taskStatusList.find((item) => item.id === value)?.name; + } else if (type === '执行部门') { + return state.departmentRecursionList.find((item) => item.depId === value)?.depName; + } else if (type === '检查结果') { + return state.checkResultList.find((item) => item.id === value)?.name; + } else { + if (value === 1) { + return '未认领'; + } else { + return '已认领'; + } } }; @@ -247,7 +302,7 @@ handleSearch, onOpenDialogRef, onHandleSizeChange, - onDelRecord, + onHandleTask, onHandleCurrentChange, recordDialog, recordDialogRef, -- Gitblit v1.9.2