From 558831af0d86a9db70cbe4d1d8d14bbc4c3d12cf Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期一, 05 九月 2022 09:52:56 +0800
Subject: [PATCH] 合并
---
src/views/specialWorkSystem/workTicket/workApply/index.vue | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/workApply/index.vue b/src/views/specialWorkSystem/workTicket/workApply/index.vue
index dee3dcc..ea33534 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/index.vue
@@ -2,28 +2,28 @@
<div class="home-container">
<el-tabs type="border-card">
<el-tab-pane label="动火作业">
- <fire-form></fire-form>
+ <fire-form :workerList = allWorkers></fire-form>
</el-tab-pane>
<el-tab-pane label="受限空间作业">
- <space-form></space-form>
+ <space-form :workerList = allWorkers></space-form>
</el-tab-pane>
<el-tab-pane label="吊装作业">
- <hoist-form></hoist-form>
+ <hoist-form :workerList = allWorkers></hoist-form>
</el-tab-pane>
<el-tab-pane label="动土作业">
- <ground-form></ground-form>
+ <ground-form :workerList = allWorkers></ground-form>
</el-tab-pane>
<el-tab-pane label="断路作业">
- <broken-form></broken-form>
+ <broken-form :workerList = allWorkers :departList = departmentList></broken-form>
</el-tab-pane>
<el-tab-pane label="高处作业">
- <height-form></height-form>
+ <height-form :workerList = allWorkers></height-form>
</el-tab-pane>
<el-tab-pane label="临时用电作业">
- <power-form></power-form>
+ <power-form :workerList = allWorkers></power-form>
</el-tab-pane>
<el-tab-pane label="盲板抽堵作业">
- <plate-form></plate-form>
+ <plate-form :workerList = allWorkers></plate-form>
</el-tab-pane>
</el-tabs>
</div>
@@ -39,10 +39,11 @@
import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
-
+ import {teamManageApi} from "/@/api/systemManage/basicDateManage/personShiftManage/teamManage";
interface stateType {
-
+ allWorkers: Array<any>
+ departmentList: Array<any>
}
export default defineComponent({
name: 'workTicket',
@@ -60,12 +61,28 @@
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
-
+ allWorkers: [],
+ departmentList: []
});
+
+ // 获取用户列表
const getAll = async ()=>{
const res = await workApplyApi().getAllUsers()
if (res.data.code === '200') {
- console.log(res.data.data)
+ state.allWorkers = JSON.parse(JSON.stringify(res.data.data))
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ // 获取部门列表
+ const getAllDepartment = async () => {
+ let res = await teamManageApi().getAllDepartment();
+ if (res.data.code === '200') {
+ state.departmentList = JSON.parse(JSON.stringify(res.data.data))
} else {
ElMessage({
type: 'warning',
@@ -77,6 +94,7 @@
// 页面载入时执行方法
onMounted(() => {
getAll();
+ getAllDepartment();
});
return {
--
Gitblit v1.9.2