From 3a9ca6d56fbad4c67b858185d9e9b157e3d60b82 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 22 三月 2023 08:48:51 +0800
Subject: [PATCH] 对接特殊作业接口
---
src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
index 7657aad..76515d5 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
@@ -9,6 +9,13 @@
</el-select>
</div>
<div class="basic-line">
+ <span>部门：</span>
+ <el-cascader class="input-box" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }"
+ placeholder="请选择部门" clearable v-model="tableData.params.execDepId"
+ @change="changeGroup"
+ > </el-cascader>
+ </div>
+ <div class="basic-line">
<span>执行班组：</span>
<el-select v-model="tableData.params.execClassgroupId" clearable filterable class="input-box" placeholder="执行班组">
<el-option v-for="item in classGroupList" :key="item.id" :label="item.groupName" :value="item.id"></el-option>
@@ -16,7 +23,7 @@
</div>
<div class="basic-line">
<span>任务状态：</span>
- <el-select v-model="tableData.params.taskStatus" clearable filterable class="input-box" placeholder="执行班组">
+ <el-select v-model="tableData.params.taskStatus" clearable filterable class="input-box" placeholder="任务状态">
<el-option v-for="item in taskStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</div>
@@ -73,6 +80,21 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column property="taskClaimTime" label="认领时间">
+ <template #default="scope">
+ {{scope.row.taskClaimTime?scope.row.taskClaimTime:'--'}}
+ </template>
+ </el-table-column>
+ <el-table-column property="reportTime" label="填报时间">
+ <template #default="scope">
+ {{scope.row.reportTime?scope.row.reportTime:'--'}}
+ </template>
+ </el-table-column>
+ <el-table-column property="taskTimeConsuming" label="巡检耗时">
+ <template #default="scope">
+ {{scope.row.taskTimeConsuming?scope.row.taskTimeConsuming:'--'}}
+ </template>
+ </el-table-column>
<el-table-column property="resultStatus" label="巡检结果">
<template #default="scope">
<span>
@@ -173,7 +195,7 @@
pageSize: 10,
taskName: null,
taskType: null,
- taskStatus: 2,
+ taskStatus: null,
execUserId: null,
execClassgroupId: null,
execDepId: null,
@@ -278,16 +300,16 @@
}
};
- //获取班组
- const getClassGroupData = async () => {
- let res = await teamManageApi().getRecord({ depIp: null, groupName: null, containGroupMemberEnable: null });
- if (res.data.code === '200') {
- state.classGroupList = res.data.data;
- } else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
+ const changeGroup = async () => {
+ if(state.tableData.params.execDepId === null) {
+ state.classGroupList = []
+ }else{
+ let res = await departmentApi().getByDepId({depId:state.tableData.params.execDepId})
+ if(res.data.code === '200'){
+ state.classGroupList = res.data.data
+ }else{
+
+ }
}
};
@@ -366,13 +388,11 @@
getInspectRecord();
getQuotaList();
getDepartmentData();
- getClassGroupData();
getInspectTaskPoint();
} else {
getInspectRecord();
getQuotaList();
getDepartmentData();
- getClassGroupData();
getInspectTaskPoint();
}
});
@@ -385,6 +405,7 @@
Plus,
reset,
parseNumber,
+ changeGroup,
getInspectRecord,
onHandleSizeChange,
onHandleCurrentChange,
--
Gitblit v1.9.2