From c181527b88758cec56479f2076f06c8df9dd45c6 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 30 五月 2022 15:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue b/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue
index cd582aa..63505c9 100644
--- a/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue
+++ b/src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue
@@ -17,7 +17,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="负责人:" prop="director">
- <el-input v-model="taskBasicForm.director"></el-input>
+ <el-select v-model="taskBasicForm.director" clearable filterable class="taskBasic_select">
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :value="item.realname"
+ :label="item.realname"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -64,15 +71,18 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="16">
- <el-form-item label="作业地点:" prop="area">
- <el-input v-model="taskBasicForm.area"></el-input>
+ <el-col :span="8">
+ <el-form-item label="吨位类型:" prop="etype" >
+ <el-select v-model="taskBasicForm.etype" clearable class="taskBasic_select">
+ <el-option
+ v-for="item in etypeList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
-
<el-col :span="8">
<el-form-item label="是否节假日:" prop="isholiday" >
<el-select v-model="taskBasicForm.isholiday" clearable class="taskBasic_select">
@@ -85,7 +95,17 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="16">
+
+ </el-row>
+
+ <el-row>
+
+ <el-col :span="12">
+ <el-form-item label="作业地点:" prop="area">
+ <el-input v-model="taskBasicForm.area"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容:" prop="description">
<el-input v-model="taskBasicForm.description"></el-input>
</el-form-item>
@@ -544,10 +564,11 @@
</template>
<script>
- import { getUnitList } from '@/api/unitManage'
+ import { getAllCompany } from '@/api/unitManage'
import Cookies from 'js-cookie'
import { addTask, updateTask } from '@/api/task'
import { dictionaryAllItems } from '@/api/dictionary'
+ import {safetyInspectionItemName} from "@/api/safetySelfInspection";
export default {
name: 'index',
@@ -670,12 +691,15 @@
description:'',
isanalysis:'',
analysisarea:'',
- analysismedium:''
+ analysismedium:'',
+ etype:'',
},
activeNames:['0'],
companyList:[],
fireTypeList:[],
hazardList:[],
+ userList:[],
+ etypeList:[{id:1,name:'60万吨'},{id:2,name:'130万吨'}],
list:[{id:0,name:'否'},{id:1,name:'是'}],
levelList:[{id:2,name:'特级'},{id:1,name:'一级'},{id:0,name:'二级'},],
spaceCategoryList:[{id:0,name:'密闭设备：如船舱、贮罐、车载槽罐、反应塔（釜）、冷藏箱、压力容器、管道、烟道、锅炉等'},{id:1,name:'地下有限空间：如地下管道、地下室、地下仓库、地下工程、暗沟、隧道、涵洞、地坑、废井、地窖、污水池（井）、沼气池、化粪池、下水道等'},{id:2,name:'地上有限空间：如储藏室、酒糟池、发酵池、垃圾站、温室、冷库、粮仓、料仓等'},],
@@ -722,7 +746,8 @@
description:[{ required: true, message: '作业内容不能为空', trigger: 'blur' }],
isanalysis:[{ required: true, message: '是否需要气体检测不能为空', trigger: 'change' }],
analysisarea:[{ required: true, message: '分析地点不能为空', trigger: 'blur' }],
- analysismedium:[{ required: true, message: '分析介质不能为空', trigger: 'blur' }]
+ analysismedium:[{ required: true, message: '分析介质不能为空', trigger: 'blur' }],
+ etype:[{ required: true, message: '吨位类型不能为空', trigger: 'change' }]
},
ifIncludeArea:null,
ifHoisting:null,
@@ -770,6 +795,7 @@
this.getCompany()
this.getFireTypeList()
this.getHazardList()
+ this.getUser()
},
methods:{
giveTaskBasic(){
@@ -1423,14 +1449,15 @@
})
},
async getCompany(){
- let params = {}
- params['pageIndex'] = this.currentPage
- params['pageSize'] = this.pageSize
- params['company'] = this.company
- params['code'] = this.code
- let res = await getUnitList(params)
+ // let params = {}
+ // params['pageIndex'] = this.currentPage
+ // params['pageSize'] = this.pageSize
+ // params['company'] = this.company
+ // params['code'] = this.code
+ // params['isMain'] = true
+ let res = await getAllCompany()
if(res.data.code === '200'){
- this.companyList = res.data.result.result
+ this.companyList = res.data.result
}else{
this.$message({
message:res.data.message,
@@ -1464,6 +1491,17 @@
})
}
},
+ async getUser(){
+ let res = await safetyInspectionItemName()
+ if(res.data.code === '200'){
+ this.userList = res.data.result
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ },
handleChangeBuildingFile(file,fileList){
this.uploadForm.name = file.name
this.header.Authorization = Cookies.get('token')
--
Gitblit v1.9.2