From ac703b38c8e0b92b7a15ea64a08e6a814314976e Mon Sep 17 00:00:00 2001
From: Kxc0822a <kxc000822>
Date: 星期一, 11 四月 2022 17:25:04 +0800
Subject: [PATCH] 重大
---
src/views/hiddenDangerRectification/sendHiddenDangerList.vue | 118 ++++++++++++++---------
src/views/hiddenDangerRegistration/hiddenDangerList.vue | 128 ++++++++++++++++++++-----
2 files changed, 174 insertions(+), 72 deletions(-)
diff --git a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
index f67236f..685b62e 100644
--- a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
+++ b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
@@ -309,10 +309,10 @@
</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,23 +321,9 @@
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>
- </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>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="复查时间：" prop="reviewTime">
<el-date-picker
- v-model="value1"
+ v-model="ruleForm.reviewTime"
type="date"
placeholder="选择日期"
style="width: 100%">
@@ -347,37 +333,62 @@
</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="desc">
- <el-upload
- class="upload-demo"
- ref="upload"
- action="https://jsonplaceholder.typicode.com/posts/"
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :file-list="fileList"
- :before-upload="beforeUpload"
- :auto-upload="true">
- <el-button slot="trigger" size="small" type="primary">选则文件</el-button>
- <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
- </el-upload>
+ <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>
- <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
+ 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="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" 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 style="text-align: center;">
@@ -410,9 +421,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: '超级管理员',
@@ -433,7 +456,7 @@
address: '已发送众泰煤焦化安全环保部',
}],
fileList: [],
-
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -481,9 +504,14 @@
/deep/ .multiline .el-input__inner {
height: 62px;
}
- /deep/ .textarea .el-textarea__inner{
+ /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
+ }
</style>
diff --git a/src/views/hiddenDangerRegistration/hiddenDangerList.vue b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
index 7bdf847..baf6036 100644
--- a/src/views/hiddenDangerRegistration/hiddenDangerList.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
@@ -81,7 +81,7 @@
<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-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -112,14 +112,14 @@
<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-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-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -231,7 +231,7 @@
<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-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -303,16 +303,16 @@
<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-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,40 +321,74 @@
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="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" clearable v-model="ruleForm.reviewResults"></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="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></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>
+ <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="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" 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 style="text-align: center;">
@@ -387,9 +421,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 +455,8 @@
city: '',
address: '已发送众泰煤焦化安全环保部',
}],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -422,6 +470,22 @@
}
});
},
+ 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;
+ }
+ }
}
}
</script>
@@ -440,4 +504,14 @@
/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
+ }
</style>
--
Gitblit v1.9.2