From 663da7fa440b2760cdc31cb3b2d064838a0e722b Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: Wed, 14 Sep 2022 17:57:47 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workPlan/workReservation/index.vue | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
index 16c44a1..0a792f0 100644
--- a/src/views/specialWorkSystem/workPlan/workReservation/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
@@ -2,12 +2,12 @@
<div class="home-container">
<div style="height: 100%">
<el-row class="homeCard">
- <el-col :span="6" style="display:flex;align-items: center">
- <span style="white-space: nowrap">申请部门：</span>
- <div class="grid-content topInfo">
- <el-cascader v-model="searchDep" :options="departmentList" :props="casProps" :show-all-levels="false"/>
- </div>
- </el-col>
+<!-- <el-col :span="6" style="display:flex;align-items: center">-->
+<!-- <span style="white-space: nowrap">申请部门：</span>-->
+<!-- <div class="grid-content topInfo">-->
+<!-- <el-cascader v-model="searchDep" :options="departmentList" :props="casProps" :show-all-levels="false"/>-->
+<!-- </div>-->
+<!-- </el-col>-->
<el-col :span="6" style="display:flex;align-items: center;">
<span style="white-space: nowrap;margin-left: 20px">预约日期：</span>
<div class="grid-content topInfo">
@@ -37,16 +37,16 @@
>
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column type="index" label="序号" width="80" />
- <el-table-column prop="applyDepName" label="申请部门"/>
- <el-table-column prop="appointmentTime" label="预约时间"/>
- <el-table-column prop="hotWork" label="动火作业"/>
- <el-table-column prop="confinedSpaceOper" label="受限空间作业"/>
- <el-table-column prop="liftingOper" label="吊装作业"/>
- <el-table-column prop="groundBreakingOper" label="动土作业"/>
- <el-table-column prop="openCircuitOper" label="断路作业"/>
- <el-table-column prop="workAtHeight" label="高处作业" />
- <el-table-column prop="temporaryPowerOper" label="临时用电作业"/>
- <el-table-column prop="blindPlatePluggingOper" label="盲板抽堵作业"/>
+ <el-table-column prop="applyDepName" align="center" label="申请部门"/>
+ <el-table-column prop="appointmentTime" align="center" label="预约时间"/>
+ <el-table-column prop="hotWork" align="center" label="动火作业"/>
+ <el-table-column prop="confinedSpaceOper" align="center" label="受限空间作业"/>
+ <el-table-column prop="liftingOper" align="center" label="吊装作业"/>
+ <el-table-column prop="groundBreakingOper" align="center" label="动土作业"/>
+ <el-table-column prop="openCircuitOper" align="center" label="断路作业"/>
+ <el-table-column prop="workAtHeight" align="center" label="高处作业" />
+ <el-table-column prop="temporaryPowerOper" align="center" label="临时用电作业"/>
+ <el-table-column prop="blindPlatePluggingOper" align="center" label="盲板抽堵作业"/>
<el-table-column fixed="right" label="操作" align="center" width="250">
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
@@ -142,9 +142,9 @@
</el-dialog>
<el-dialog v-model="dialogAddRecord" title="作业预约编辑" @close="closeAdd">
<el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
- <el-form-item label="申请部门" prop="applyDepId">
- <el-cascader :disabled = isDisabled v-model="addRecord.applyDepId" :options="departmentList" :props="casProps" :show-all-levels="false" @change="handleChange" />
- </el-form-item>
+<!-- <el-form-item label="申请部门" prop="applyDepId">-->
+<!-- <el-cascader placeholder="若选择部门非本人所在部门，则记录不会出现在该页面" :disabled = isDisabled v-model="addRecord.applyDepId" :options="departmentList" :props="casProps" :show-all-levels="false" @change="handleChange" />-->
+<!-- </el-form-item>-->
<el-form-item label="预约时间" prop="appointmentTime">
<el-date-picker
v-model="addRecord.appointmentTime"
@@ -224,7 +224,7 @@
import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
import { workReserveApi } from '/@/api/specialWorkSystem/workPlan/workReservation';
import { teamManageApi } from '/@/api/systemManage/basicDateManage/personShiftManage/teamManage';
- import {holidayGroupApi} from "/@/api/systemManage/basicDateManage/personShiftManage/holidayTimeGroup";
+
// 定义接口来定义对象的类型
interface stateType {
tableData: Array<any>;
@@ -299,7 +299,6 @@
const addRef = ref<FormInstance>();
const addRules = reactive<FormRules>({
- applyDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
appointmentTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
hotWork: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
groundBreakingOper: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
--
Gitblit v1.9.2