From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/views/specialWorkManage/workTicket/workApply/components/hoist.vue | 146 ++++++++++++++++++++++++++++++++----------------
1 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/src/views/specialWorkManage/workTicket/workApply/components/hoist.vue b/src/views/specialWorkManage/workTicket/workApply/components/hoist.vue
index 24e900e..1b10a21 100644
--- a/src/views/specialWorkManage/workTicket/workApply/components/hoist.vue
+++ b/src/views/specialWorkManage/workTicket/workApply/components/hoist.vue
@@ -4,46 +4,57 @@
<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="operatorCompanys">
+ <el-input
+ v-model="form.operatorCompanys"
+ placeholder="请输入施工单位"
+ />
+ </el-form-item>
+ </el-col>
<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.uid"
- :label="item.username"
- :value="item.uid"
- />
- </el-select>
+ <el-form-item label="作业人" prop="operatorUnames">
+<!-- <el-select v-model="form.operatorUnames" 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="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="workTimeLine">
- <el-date-picker
- v-model="form.workTimeLine"
- format="YYYY-MM-DD HH:mm"
- value-format="YYYY-MM-DD HH:mm:00"
- type="datetimerange"
- range-separator="至"
- start-placeholder="开始时间"
- end-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"
+ 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">
+ <el-option
+ v-for="item in workLevelList"
+ :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="workContent">
@@ -66,6 +77,19 @@
</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.hoistingToolName">
@@ -89,10 +113,11 @@
</el-form-item>
</el-col>
</el-row>
+
</div>
</el-form>
<div class="applyBtn">
- <el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">发起申请</el-button>
+ <el-button type="primary" size="large" plain @click="submitForm()">发起申请</el-button>
</div>
</div>
</div>
@@ -100,14 +125,17 @@
<script>
- export default{
+ import {workApplyApi} from "../../../../../api/workApply";
+
+ export default{
name: 'hoistForm',
components: {},
props:['workerList'],
data(){
return{
form: {
- operatorUids: [],
+ operatorCompanys: '',
+ operatorUnames: '',
workType: 3,
workLevel: null,
workContent: '',
@@ -118,6 +146,7 @@
},
workTimeLine: [],
expStartTime: '',
+ hazardIdentification: '',
expEndTime: ''
},
workLevelList: [
@@ -135,10 +164,12 @@
}
],
applyRules:{
- operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ operatorCompanys: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ operatorUnames: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.hoistingToolName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -147,25 +178,40 @@
}
},
methods:{
- async submitForm (formEl) {
- if (!formEl) return
- await formEl.validate(async (valid, fields) => {
+ submitForm (formEl) {
+ this.$refs["ruleFormRef"].validate(async (valid, fields) => {
if (valid) {
- state.form.expStartTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[0]
- state.form.expEndTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[1]
- let { workTimeLine, ...data } = JSON.parse(JSON.stringify(state.form))
+ this.form.expStartTime = JSON.parse(JSON.stringify(this.form.workTimeLine))[0]
+ this.form.expEndTime = JSON.parse(JSON.stringify(this.form.workTimeLine))[1]
+ let { workTimeLine, ...data } = JSON.parse(JSON.stringify(this.form))
data.workDetail.weightMass = Number(data.workDetail.weightMass)
const res = await workApplyApi().postHoistApply(data)
if (res.data.code === '200') {
- ElMessage({
+ this.$message({
type: 'success',
message: '提交成功！'
});
- formEl.resetFields()
+ this.$refs["ruleFormRef"].clearValidate()
+ this.form = {
+ operatorCompanys: '',
+ operatorUnames: '',
+ workType: 3,
+ workLevel: null,
+ workContent: '',
+ workLocation: '',
+ workDetail:{
+ hoistingToolName: '',
+ weightMass: null
+ },
+ workTimeLine: [],
+ expStartTime: '',
+ hazardIdentification: '',
+ expEndTime: ''
+ }
} else {
- ElMessage({
+ this.$message({
type: 'warning',
- message: res.data.msg
+ message: res.data.message
});
}
} else {
--
Gitblit v1.9.2