From 17bc12d7414dedab9d8eb60794603e61e8cce01e Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 25 十月 2022 17:20:35 +0800
Subject: [PATCH] '更新'
---
src/views/specialWorkManage/workTicket/workApply/components/height.vue | 108 +++++++++++++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/src/views/specialWorkManage/workTicket/workApply/components/height.vue b/src/views/specialWorkManage/workTicket/workApply/components/height.vue
index 9b5f0a8..5da033b 100644
--- a/src/views/specialWorkManage/workTicket/workApply/components/height.vue
+++ b/src/views/specialWorkManage/workTicket/workApply/components/height.vue
@@ -4,30 +4,45 @@
<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef">
<div class="homeCard">
<el-row>
- <el-col :span="12">
- <el-form-item label="作业人" prop="operatorUids">
- <el-select v-model="form.operatorUids" multiple>
- <el-option
- v-for="item in workerList"
- :key="item.id"
- :label="item.realname + '(' + item.username.toString().replace(/^(\d{3})\d{4}(\d{4})$/,'$1****$2') + ')'"
- :value="item.id"
- />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
- <el-form-item label="危险辨识" prop="hazardIdentification">
+ <el-form-item label="施工单位" prop="operatorCompanys">
<el-input
- v-model="form.hazardIdentification"
- autosize
- type="textarea"
- placeholder="请输入危险辨识"
+ v-model="form.operatorCompanys"
+ placeholder="请输入施工单位"
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="作业人" prop="operatorUnames">
+<!-- <el-select v-model="form.operatorUids" multiple>-->
+<!-- <el-option-->
+<!-- v-for="item in workerList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.realname + '(' + item.username.toString().replace(/^(\d{3})\d{4}(\d{4})$/,'$1****$2') + ')'"-->
+<!-- :value="item.id"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-input
+ v-model="form.operatorUnames"
+ placeholder="请输入作业人"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
+ <el-col :span="12">
+ <el-form-item label="作业时间" prop="workTimeLine">
+ <el-date-picker
+ v-model="form.workTimeLine"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetimerange"
+ range-separator="至"
+ start-placeholder="开始时间"
+ end-placeholder="结束时间"
+ />
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="作业等级" prop="workLevel">
<el-select v-model="form.workLevel">
@@ -38,19 +53,6 @@
:value="item.value"
/>
</el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="作业时间" prop="workTimeLine">
- <el-date-picker
- v-model="form.workTimeLine"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetimerange"
- range-separator="至"
- start-placeholder="开始时间"
- end-placeholder="结束时间"
- />
</el-form-item>
</el-col>
</el-row>
@@ -76,17 +78,30 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="危险辨识" prop="hazardIdentification">
+ <el-input
+ v-model="form.hazardIdentification"
+ autosize
+ type="textarea"
+ 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.operationDepId">
- <el-select v-model="form.workDetail.operationDepId">
- <el-option
- v-for="item in heDepList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+ <el-select v-model="form.workDetail.operationDepId">
+ <el-option
+ v-for="item in departList"
+ :key="item.id"
+ :label="item.department"
+ :value="item.id"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -131,11 +146,12 @@
export default{
name: 'heightForm',
components: {},
- props:['workerList'],
+ props:['workerList','departList'],
data(){
return{
form: {
- operatorUids: [],
+ operatorCompanys: '',
+ operatorUnames: '',
workType: 6,
workLevel: null,
workContent: '',
@@ -239,10 +255,11 @@
}
],
applyRules:{
- operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'change' }],
+ operatorCompanys: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ operatorUnames: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
- workLevel: [{ required: true, message: '该内容不能为空', trigger: 'change' }],
+ workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -260,7 +277,7 @@
let { workTimeLine, ...data } = JSON.parse(JSON.stringify(this.form))
data.workDetail.otherSpecialWork = data.workDetail.otherSpecialWork.join(',')
console.log(data,'data')
- const res = await workApplyApi().postFireApply(data)
+ const res = await workApplyApi().postHeightApply(data)
if (res.data.code === '200') {
this.$message({
type: 'success',
@@ -268,7 +285,8 @@
});
this.$refs["ruleFormRef"].clearValidate()
this.form = {
- operatorUids: [],
+ operatorCompanys: '',
+ operatorUnames: '',
workType: 6,
workLevel: null,
workContent: '',
@@ -286,7 +304,7 @@
} else {
ElMessage({
type: 'warning',
- message: res.data.msg
+ message: res.data.message
});
}
} else {
--
Gitblit v1.9.2