From ab254545271d2e2194026c96a22a302560292e85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 15 Apr 2022 09:48:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/hiddenDangerRectification/sendHiddenDangerList.vue | 217 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 153 insertions(+), 64 deletions(-)
diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
similarity index 67%
copy from src/views/accidentHidden/hiddenDangerList.vue
copy to src/views/hiddenDangerRectification/sendHiddenDangerList.vue
index 7bdf847..0fa02ce 100644
--- a/src/views/accidentHidden/hiddenDangerList.vue
+++ b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
@@ -7,12 +7,12 @@
style="margin: 0 14% 0 16%;">
<el-row>
<el-col :span="9">
- <el-form-item label="隐患编号：" prop="name">
+ <el-form-item label="隐患编号" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="检查单位：" prop="elementAName">
+ <el-form-item label="检查单位" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -24,7 +24,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查人：" prop="region">
+ <el-form-item label="检查人" prop="region">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
@@ -35,14 +35,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="陪检人员：" prop="name">
+ <el-form-item label="陪检人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查时间：" prop="name">
+ <el-form-item label="检查时间" prop="name">
<el-date-picker
v-model="value1"
type="date"
@@ -56,7 +56,7 @@
<!-- <el-form-item label="班次：" prop="name">-->
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="班次：" prop="elementAName">
+ <el-form-item label="班次" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -68,26 +68,26 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="跟班、带班情况：" prop="name">
+ <el-form-item label="跟班、带班情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="跟班、带班人员：" prop="name">
+ <el-form-item label="跟班、带班人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="行走路线：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="行走路线" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患单位：" prop="name">
+ <el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -98,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患部门：" prop="name">
+ <el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -111,21 +111,21 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患地点：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患地点" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患内容：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患内容" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患类别：" prop="name">
+ <el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -136,7 +136,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患级别：" prop="name">
+ <el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -149,19 +149,19 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="整改措施：" prop="name">
+ <el-form-item label="整改措施" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="所需资金：" prop="name">
+ <el-form-item label="所需资金" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="限改时间：" prop="name">
+ <el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -173,14 +173,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="责任人：" prop="name">
+ <el-form-item label="责任人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -192,14 +192,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改完成情况：" prop="name">
+ <el-form-item label="整改完成情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="name">
+ <el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -211,33 +211,33 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="复查人：" prop="name">
+ <el-form-item label="复查人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查结果：" prop="name">
+ <el-form-item label="复查结果" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改次数：" prop="name">
+ <el-form-item label="整改次数" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="危险源：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="危险源" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="风险等级：" prop="name">
+ <el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -248,7 +248,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="业务科室：" prop="name">
+ <el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -261,10 +261,11 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="流程信息：" prop="name">
+ <el-form-item label="流程信息" prop="name">
<!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
<el-table
:data="tableData"
+ border
style="width: 100%">
<el-table-column
prop="date"
@@ -274,25 +275,25 @@
</el-table-column>
<el-table-column
prop="name"
- label="操作人："
+ label="操作人"
align="center"
- width="139">
+ width="138">
</el-table-column>
<el-table-column
prop="province"
- label="处理时间："
+ label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
prop="city"
- label="审批意见："
+ label="审批意见"
align="center"
width="260">
</el-table-column>
<el-table-column
prop="address"
- label="流程信息："
+ label="流程信息"
align="center"
width="170">
</el-table-column>
@@ -302,17 +303,17 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="发送流程：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="发送流程" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="下一步：" prop="name">
+ <el-form-item label="是否发送" prop="name">
<el-radio-group v-model="ruleForm.safetyInspectionItemResult">
- <el-radio :label="0">申请复查</el-radio>
- <el-radio :label="1">不接受,返回安全环保部</el-radio>
+ <el-radio :label="0">通过</el-radio>
+ <el-radio :label="1">不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -321,45 +322,79 @@
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="落实责任人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="选择复查单位/人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div
+ v-else="ruleForm.safetyInspectionItemResult == 1">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="9">
- <el-form-item label="所需资金：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc1">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="22">
- <el-form-item label="备注" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -375,7 +410,7 @@
export default {
components: {Titlename},
- name: "hiddenDangerList",
+ name: "sendHiddenDangerList",
data() {
return {
ruleForm: {
@@ -387,9 +422,21 @@
type: [],
resource: '',
value1: '',
- desc: ''
+ desc: '',
+ rechecker:'',
+ reviewTime:'',
+ reviewResults:'',
+ rechecker1:'',
+ reviewTime1:'',
+ reviewResults1:'',
+ desc1:''
},
- rules: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
tableData: [{
date: ' 1',
name: '超级管理员',
@@ -409,6 +456,8 @@
city: '',
address: '已发送众泰煤焦化安全环保部',
}],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -422,6 +471,27 @@
}
});
},
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerRectification"
+ })
+ }
}
}
</script>
@@ -440,4 +510,23 @@
/deep/ .multiline .el-input__inner {
height: 62px;
}
+ /deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ /deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
</style>
--
Gitblit v1.9.2