From fd41f55c6178449e1802ff43f46a477247032d97 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期一, 26 九月 2022 15:41:31 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/workApply/components/fire.vue | 67 +++++++++++++++------------------
1 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
index fc1ed90..f3ebc7f 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
@@ -9,23 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="作业等级" prop="workLevel">
- <el-select v-model="form.workLevel">
- <el-option
- v-for="item in workLevelList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -46,6 +32,18 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="作业等级" prop="workLevel">
+ <el-select v-model="form.workLevel">
+ <el-option
+ v-for="item in workLevelList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容" prop="workContent">
<el-input
v-model="form.workContent"
@@ -55,6 +53,8 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="作业地址" prop="workLocation">
<el-input
@@ -65,7 +65,16 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="危害辨识" prop="hazardIdentification">
+ <el-input
+ v-model="form.hazardIdentification"
+ placeholder="请输入危害辨识"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="动火方式" prop="workDetail.hotMethod">
@@ -113,7 +122,6 @@
interface stateType {
form: Object,
- workerList: Array<any>,
workTypeList: Array<any>,
workLevelList: Array<any>,
otherWorkList: Array<any>
@@ -121,6 +129,7 @@
export default defineComponent({
name: 'fireForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -131,6 +140,7 @@
workLevel: null,
workContent: '',
workLocation: '',
+ hazardIdentification: '',
workDetail:{
hotMethod: '',
otherSpecialWork: []
@@ -139,24 +149,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
workTypeList: [
{
label: "类型一",
@@ -223,6 +215,7 @@
workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.hotMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
@@ -287,7 +280,7 @@
.applyBtn{
width: 100%;
background: #fff;
- height: 80px;
+ padding-top: 15px;
z-index: 5;
box-shadow: 0 -3px 8px rgba(150,150,150,.1);
display: flex;
--
Gitblit v1.9.2