1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-10 20:39:48 +08:00

新增表单获取附件,优化隐患排查治理图片查看

This commit is contained in:
dengfuchuan 2021-04-10 12:52:31 +08:00
parent 33762ffb8e
commit 78da30869b
11 changed files with 329 additions and 339 deletions

View File

@ -1,71 +1,71 @@
<template>
<div>
<el-button v-for="d in data" :key="d.method" type="primary" @click="Fn(d.method)">{{ d.text }}</el-button>
</div>
</template>
<script>
import api from '@/api/public'
export default {
props: {
funid: {
type: String,
default: '' || 'sys_dept'
}
},
data() {
return {
data: [],
loading: false
}
},
created() {
this.getButtons()
},
methods: {
getButtons() {
this.loading = true
api.getButtons(this.funid).then(data => {
if (data.success) {
this.data = data.data.buttons
this.loading = false
} else {
this.$message.error(data.message)
}
})
},
Fn(method) {
this[method]()
},
editCreate() {
this.$emit('editCreate')
},
editDelete() {
this.$emit('editDelete')
},
editSave() {
this.$emit('editSave')
},
upload() {
this.$emit('upload')
},
save() {
this.$emit('save')
},
create() {
this.$emit('Create')
},
del() {
this.$emit('Del')
}
}
}
</script>
<style lang="scss" scoped>
// .el-card {
// margin-top: 10px;
// }
</style>
<template>
<div>
<el-button v-for="d in data" :key="d.method" type="primary" @click="Fn(d.method)">{{ d.text }}</el-button>
</div>
</template>
<script>
import api from '@/api/public'
export default {
props: {
funid: {
type: String,
default: '' || 'sys_dept'
}
},
data() {
return {
data: [],
loading: false
}
},
created() {
this.getButtons()
},
methods: {
getButtons() {
this.loading = true
api.getButtons(this.funid).then(data => {
if (data.success) {
this.data = data.data.buttons
this.loading = false
} else {
this.$message.error(data.message)
}
})
},
Fn(method) {
this[method]()
},
editCreate() {
this.$emit('editCreate')
},
editDelete() {
this.$emit('editDelete')
},
editSave() {
this.$emit('editSave')
},
upload() {
this.$emit('upload')
},
save() {
this.$emit('save')
},
create() {
this.$emit('Create')
},
del() {
this.$emit('Del')
}
}
}
</script>
<style lang="scss" scoped>
// .el-card {
// margin-top: 10px;
// }
</style>

View File

@ -1,57 +1,60 @@
<template>
<div>
<el-button v-for="d in data" :key="d.method" type="primary" @click="Fn(d.method)">{{ d.text }}</el-button>
</div>
</template>
<script>
import api from '@/api/public'
export default {
props: {
funid: {
type: String,
default: ''
}
},
data() {
return {
data: []
}
},
created() {
this.getButtons()
},
methods: {
getButtons() {
api.getFormBtn(this.funid).then(data => {
if (data.success) {
this.data = data.data.buttons
} else {
this.$message.error(data.message)
}
})
},
Fn(method) {
this[method]()
},
create() {
this.$emit('create')
},
del() {
this.$emit('del')
},
save() {
this.$emit('save')
}
}
}
</script>
<style lang="scss" scoped>
// .el-card {
// margin-top: 10px;
// }
</style>
<template>
<div>
<el-button v-for="d in data" :key="d.method" type="primary" @click="Fn(d.method)">{{ d.text }}</el-button>
</div>
</template>
<script>
import api from '@/api/public'
export default {
props: {
funid: {
type: String,
default: ''
}
},
data() {
return {
data: []
}
},
created() {
this.getButtons()
},
methods: {
getButtons() {
api.getFormBtn(this.funid).then(data => {
if (data.success) {
this.data = data.data.buttons
} else {
this.$message.error(data.message)
}
})
},
Fn(method) {
this[method]()
},
create() {
this.$emit('create')
},
del() {
this.$emit('del')
},
save() {
this.$emit('save')
},
upload() {
this.$emit('upload')
}
}
}
</script>
<style lang="scss" scoped>
// .el-card {
// margin-top: 10px;
// }
</style>

View File

@ -8,7 +8,7 @@ export default {
return request({
url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=${roles}`,
method: 'post',
data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}`
data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.fun_id = ?&where_type=string;string&where_value=${data_id};${table_name}`
}).then(response => response.data)
},
Delete(ids) {

View File

@ -1,18 +1,29 @@
<template>
<el-card>
<div v-for="(item , i) in imgList" :key="i" class="img">
<el-image :preview-src-list="imgPathList" :src="baseUrl +'?funid=sys_attach&pagetype=editgrid&eventcode=down&nousercheck=1&dataType=byte&keyid='+ item.sys_attach__attach_id +'&is_highimage=1'" />
</div>
</el-card>
<el-collapse @change="handleChange">
<el-collapse-item :title="title" name="1">
<el-card>
<div v-if="imgList.length > 0">
<div v-for="(item , i) in imgList" :key="i" class="img-box">
<div class="img">
<el-image :preview-src-list="imgPathList" :src="baseUrl +'?funid=sys_attach&pagetype=editgrid&eventcode=down&nousercheck=1&dataType=byte&keyid='+ item.sys_attach__attach_id +'&is_highimage=1'" />
</div>
<span>{{ item.sys_attach__attach_name }}</span>
</div>
</div>
<div v-else class="no-data">
{{ title }}
</div>
</el-card>
</el-collapse-item>
</el-collapse>
</template>
<script>
import api from './api'
import store from '@/store/modules/user'
var roles = store.state.roles.replace(/;/g, '')
export default {
name: 'SafeIdsp',
name: 'ShowImg',
components: {
// buttons
},
@ -28,6 +39,10 @@ export default {
funId: {
type: String,
default: null
},
title: {
type: String,
default: null
}
},
data() {
@ -75,7 +90,6 @@ export default {
},
created() {
this.getList()
this.initFormData()
},
mounted() {
},
@ -90,7 +104,7 @@ export default {
this.pager.pageSize,
pageNo,
this.dataId,
this.tableName
this.funId
).then(data => {
if (data.success) {
this.data = data.data.root
@ -111,110 +125,10 @@ export default {
}
})
},
initFormData() {
this.formData.attach_path = ''
this.formData.funid = 'sys_attach'
this.formData.eventcode = 'create'
this.formData.nousercheck = '1'
this.formData.table_name = this.tableName
this.formData.datafunid = this.funId
this.formData.user_id = 'administrator'
this.formData.dataid = this.dataId[0]
},
create() {
this.$refs['form'].validate((valid) => {
if (valid) {
const data = `funid=sys_dept&parentId=${this.dept_id}&levelCol=sys_dept.dept_level&keyid=&pagetype=editgrid&eventcode=save_eg&sys_dept__dept_code=${this.form.dept_code}&sys_dept__dept_name=${this.form.dept_name}&sys_dept__memo=${this.form.memo}&sys_dept__is_novalid=0&sys_dept__dept_id=&sys_dept__dept_level=${Number(this.level) + 1}&user_id=administrator&dataType= json`
api.Crerte(data).then(data => {
if (data.success) {
this.getList()
this.dialogFormVisible = false
this.$refs['form'].resetFields()
this.form.dept_name = ''
this.form.dept_code = ''
this.$message.success('新增成功!')
} else {
this.$message.error(data.message)
}
})
}
})
},
Delete(row) {
this.ids = []
this.ids.push(row.sys_attach__attach_id)
this.editDelete()
},
editDelete() {
if (this.ids && this.ids.length > 0) {
this.$confirm('确认删除附件?').then(() => {
api.Delete(this.ids).then(data => {
if (data.success) {
this.getList()
this.$message.success('删除成功!')
} else {
this.$message.error(data.message)
}
})
}).catch(() => {})
} else {
this.$message.warning('请选择数据进行删除')
handleChange(val) {
if (val.length > 0) {
this.getList()
}
},
editSave() {
console.log('editSave')
},
upload() {
console.log('upload')
},
edit(row) {
this.id = row.attach_id
this.parent_id = this.id.substring(0, this.id.length - 4)
console.log(this.parent_id, this.id)
this.auditForm = row
this.dialogEditVisible = true
},
auditFormChange(form) {
this.saveFrom = form
},
cellDblclick(row) {
},
sizeChange(size) {
this.pager.pageSize = size
this.getList()
},
pageChange(page) {
this.pager.pageNo = page
this.getList()
},
handleSelectionChange(val) {
console.log(val)
this.ids = val.map(d => d.sys_attach__attach_id)
},
async downLoadAttach(row) {
const timestamp = new Date().getTime()
this.href = `${this.baseUrl}?funid=sys_attach&keyid=${row.sys_attach__attach_id}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=${timestamp}`
// await api.downLoad(row.sys_attach__attach_id)
},
handleRemove(file, fileList) {
console.log(file, fileList)
},
handlePreview(file) {
console.log(file)
},
handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 9 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}`)
},
onChange(file) {
this.formData.attach_path = file.raw
},
onSuccess() {
this.$message.success('上传成功!')
this.getList()
this.$refs.upload.clearFiles()
}
}
}
@ -239,8 +153,11 @@ export default {
.pagination{
overflow: auto;
}
.img{
.img-box{
display: inline-block;
text-align: center;
}
.img{
width: 188px;
height: 108px;
text-align: center;
@ -252,11 +169,22 @@ export default {
box-shadow: 2px 2px 5px;
margin-right: 4px;
box-sizing: border-box;
padding: 10px;
// padding: 5px;
margin: 20px;
.el-image{
width: 100%;
height: 100%;
}
}
::v-deep .el-collapse-item__header{
display: block !important;
text-align: center;
}
::v-deep .el-collapse-item__wrap{
border: none;
}
.no-data{
text-align: center;
color: #8a8f93;
}
</style>

View File

@ -53,8 +53,11 @@
}}
</a>
</div>
<div v-else-if="d.label==='上传日期'">
{{ parseTime(scope.row.sys_attach__upload_date) }}
</div>
<div v-else-if="d.label === '操作'">
<el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" />
<el-button icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" />
</div>
<div v-else>{{ scope.row[d.prop] }}</div>
</template>
@ -80,6 +83,7 @@
<script>
import api from './api'
import store from '@/store/modules/user'
import { parseTime } from '@/utils/index'
var roles = store.state.roles.replace(/;/g, '')
export default {
@ -103,6 +107,7 @@ export default {
},
data() {
return {
parseTime,
loading: false,
data: [],
deptTree: [],

View File

@ -7,12 +7,12 @@
</div>
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患编号">
<el-input v-model="form.hidden_danger__hidden_code" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="巡检状态">
<el-select v-model="form.hidden_danger__hidden_state" placeholder="请选择" :disabled="!disabled">
<el-option
@ -24,7 +24,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item ref="hidden_danger__check_man" label="检查人" prop="hidden_danger__check_man">
<el-input v-model="form.hidden_danger__check_man" placeholder="请选择检查人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkManVisible = !checkManVisible" />
@ -33,14 +33,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查部门">
<el-input v-model="form.hidden_danger__check_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkDeptVisible = !checkDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查时间" prop="hidden_danger__check_date">
<el-date-picker
v-model="form.hidden_danger__check_date"
@ -52,40 +52,40 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查地点">
<el-input v-model="form.hidden_danger__check_location" maxlength="250" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查内容">
<el-input v-model="form.hidden_danger__check_content" type="textarea" maxlength="500" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患描述" prop="hidden_danger__check_problem">
<el-input v-model="form.hidden_danger__check_problem" type="textarea" maxlength="500" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改人">
<el-input v-model="form.hidden_danger__reform_man" placeholder="请选择整改人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformManVisible = !reformManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改部门">
<el-input v-model="form.hidden_danger__reform_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformDeptVisible = !reformDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改期限">
<el-date-picker
v-model="form.hidden_danger__reform_limit"
@ -359,9 +359,6 @@ export default {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.el-col{
margin-left: 2%;
}
.buttons {
display: flex;
.el-button--primary {

View File

@ -2,17 +2,17 @@
<div>
<el-card>
<div class="buttons">
<buttons funid="hidden_check" style="margin-bottom:20px" @save="save" />
<buttons funid="hidden_check" style="margin-bottom:20px" @save="save" @upload="upload" />
<el-button type="primary" @click="back">返回列表</el-button>
</div>
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患编号">
<el-input v-model="form.hidden_danger__hidden_code" :disabled="!disabled" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="巡检状态">
<el-select v-model="form.hidden_danger__hidden_state" placeholder="请选择" :disabled="!disabled">
<el-option
@ -24,7 +24,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item ref="hidden_danger__check_man" label="检查人" prop="hidden_danger__check_man">
<el-input v-model="form.hidden_danger__check_man" placeholder="请选择检查人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkManVisible = !checkManVisible" />
@ -33,14 +33,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查部门">
<el-input v-model="form.hidden_danger__check_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkDeptVisible = !checkDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查时间" prop="hidden_danger__check_date">
<el-date-picker
v-model="form.hidden_danger__check_date"
@ -52,40 +52,40 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查地点">
<el-input v-model="form.hidden_danger__check_location" maxlength="250" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查内容">
<el-input v-model="form.hidden_danger__check_content" type="textarea" maxlength="500" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患描述" prop="hidden_danger__check_problem">
<el-input v-model="form.hidden_danger__check_problem" type="textarea" maxlength="500" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改人">
<el-input v-model="form.hidden_danger__reform_man" placeholder="请选择整改人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformManVisible = !reformManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改部门">
<el-input v-model="form.hidden_danger__reform_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformDeptVisible = !reformDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改期限">
<el-date-picker
v-model="form.hidden_danger__reform_limit"
@ -102,12 +102,10 @@
</el-card>
<el-row>
<el-col class="img" :span="12">
<span class="img-title">隐患排查图片</span>
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" />
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" title="隐患排查图片" />
</el-col>
<el-col class="img" :span="12">
<span class="img-title">隐患整改图片</span>
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" />
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_reform" title="隐患整改图片" />
</el-col>
</el-row>
<el-dialog
@ -162,6 +160,12 @@
<el-button type="primary" @click="selReformDept"> </el-button>
</span>
</el-dialog>
<el-dialog v-if="dialogUploadVisible" title="附件" :visible.sync="dialogUploadVisible" width="45%" @close="closeUploadDialog">
<Attach ref="attach" :data-id="[id]" table-name="hidden_danger" fun-id="hidden_check" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogUploadVisible = false">返回</el-button>
</div>
</el-dialog>
</div>
</template>
@ -172,13 +176,15 @@ import buttons from '@/components/formBtn'
import SelUser from '@/components/selUser'
import SelDept from '@/components/selDept'
import ShowImages from '@/components/show_images'
import Attach from '@/components/sys_attach'
export default {
name: 'HiddenCheckAuditForm',
components: {
buttons,
SelUser,
SelDept,
ShowImages
ShowImages,
Attach
},
// props: {
// id: { type: String, default: () => '' }
@ -229,6 +235,7 @@ export default {
reformManVisible: false,
checkDeptVisible: false,
reformDeptVisible: false,
dialogUploadVisible: false,
hiddenState: []
}
},
@ -267,6 +274,12 @@ export default {
}
})
},
upload() {
this.dialogUploadVisible = true
},
closeUploadDialog() {
this.dialogUploadVisible = false
},
onSubmit() {},
getCheckMan(data) {
this.form.hidden_danger__check_man = data.sys_user__user_name

View File

@ -7,12 +7,12 @@
</div>
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患编号">
<el-input v-model="form.hidden_danger__hidden_code" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="巡检状态">
<el-select v-model="form.hidden_danger__hidden_state" placeholder="请选择" :disabled="!disabled">
<el-option
@ -24,7 +24,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查人">
<el-input v-model="form.hidden_danger__check_man" placeholder="请选择检查人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkManVisible = !checkManVisible" />
@ -33,14 +33,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查部门">
<el-input v-model="form.hidden_danger__check_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkDeptVisible = !checkDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查时间">
<el-date-picker
v-model="form.hidden_danger__check_date"
@ -52,40 +52,40 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查地点">
<el-input v-model="form.hidden_danger__check_location" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查内容">
<el-input v-model="form.hidden_danger__check_content" type="textarea" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患描述" prop="hidden_danger__check_problem">
<el-input v-model="form.hidden_danger__check_problem" type="textarea" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改人">
<el-input v-model="form.hidden_danger__reform_man" placeholder="请选择整改人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformManVisible = !reformManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改部门">
<el-input v-model="form.hidden_danger__reform_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformDeptVisible = !reformDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改期限">
<el-date-picker
v-model="form.hidden_danger__reform_limit"

View File

@ -2,7 +2,7 @@
<div>
<el-card>
<div class="buttons">
<buttons funid="hidden_check" style="margin-bottom:20px" @save="save" />
<buttons funid="hidden_check" style="margin-bottom:20px" @save="save" @upload="upload" />
<el-button type="primary" @click="back">返回列表</el-button>
</div>
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
@ -10,12 +10,12 @@
<div class="classify-title">| <span>隐患排查</span></div>
</div>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患编号">
<el-input v-model="form.hidden_danger__hidden_code" :disabled="!disabled" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="巡检状态">
<el-select v-model="form.hidden_danger__hidden_state" placeholder="请选择" :disabled="!disabled">
<el-option
@ -27,7 +27,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查人">
<el-input v-model="form.hidden_danger__check_man" placeholder="请选择检查人" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="checkManVisible = !checkManVisible" />
@ -36,14 +36,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查部门">
<el-input v-model="form.hidden_danger__check_dept" placeholder="请选择检查部门" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="checkDeptVisible = !checkDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查时间">
<el-date-picker
v-model="form.hidden_danger__check_date"
@ -56,40 +56,40 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查地点">
<el-input v-model="form.hidden_danger__check_location" :disabled="!disabled" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查内容">
<el-input v-model="form.hidden_danger__check_content" type="textarea" :disabled="!disabled" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患描述" prop="hidden_danger__check_problem">
<el-input v-model="form.hidden_danger__check_problem" type="textarea" :disabled="!disabled" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改人">
<el-input v-model="form.hidden_danger__reform_man" placeholder="请选择整改人" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="reformManVisible = !reformManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改部门">
<el-input v-model="form.hidden_danger__reform_dept" placeholder="请选择检查部门" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="reformDeptVisible = !reformDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改期限">
<el-date-picker
v-model="form.hidden_danger__reform_limit"
@ -109,7 +109,7 @@
</div>
</div>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改时间" prop="hidden_danger__reform_date">
<el-date-picker
v-model="form.hidden_danger__reform_date"
@ -121,12 +121,12 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="投入费用">
<el-input v-model="form.hidden_danger__reform_money" placeholder="请输入安全投入费用" class="input-with-select" clearable />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改情况">
<el-input v-model="form.hidden_danger__reform_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable maxlength="500" />
</el-form-item>
@ -134,6 +134,14 @@
</el-row>
</el-form>
</el-card>
<el-row>
<el-col class="img" :span="12">
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" title="隐患排查图片" />
</el-col>
<el-col class="img" :span="12">
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_reform" title="隐患整改图片" />
</el-col>
</el-row>
<el-dialog
v-if="checkManVisible"
title="选择人员"
@ -186,6 +194,12 @@
<el-button type="primary" @click="selReformDept"> </el-button>
</span>
</el-dialog>
<el-dialog v-if="dialogUploadVisible" title="附件" :visible.sync="dialogUploadVisible" width="45%" @close="closeUploadDialog">
<Attach ref="attach" :data-id="[id]" table-name="hidden_danger" fun-id="hidden_check" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogUploadVisible = false">返回</el-button>
</div>
</el-dialog>
</div>
</template>
@ -195,12 +209,16 @@ import publicApi from '@/api/public'
import buttons from '@/components/formBtn'
import SelUser from '@/components/selUser'
import SelDept from '@/components/selDept'
import ShowImages from '@/components/show_images'
import Attach from '@/components/sys_attach'
export default {
name: 'HiddenReformAuditForm',
components: {
buttons,
SelUser,
SelDept
SelDept,
ShowImages,
Attach
},
// props: {
// id: { type: String, default: () => '' }
@ -249,6 +267,7 @@ export default {
reformManVisible: false,
checkDeptVisible: false,
reformDeptVisible: false,
dialogUploadVisible: false,
hiddenState: []
}
},
@ -279,6 +298,12 @@ export default {
}
})
},
upload() {
this.dialogUploadVisible = true
},
closeUploadDialog() {
this.dialogUploadVisible = false
},
onSubmit() {},
getCheckMan(data) {
this.form.hidden_danger__check_man = data.sys_user__user_name
@ -380,9 +405,6 @@ export default {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.el-col{
margin-left: 2%;
}
.buttons {
display: flex;
.el-button--primary {

View File

@ -7,12 +7,12 @@
</div>
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患编号">
<el-input v-model="form.hidden_danger__hidden_code" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="巡检状态">
<el-select v-model="form.hidden_danger__hidden_state" placeholder="请选择" :disabled="!disabled">
<el-option
@ -24,7 +24,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查人">
<el-input v-model="form.hidden_danger__check_man" placeholder="请选择检查人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkManVisible = !checkManVisible" />
@ -33,14 +33,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查部门">
<el-input v-model="form.hidden_danger__check_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="checkDeptVisible = !checkDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查时间">
<el-date-picker
v-model="form.hidden_danger__check_date"
@ -52,40 +52,40 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查地点">
<el-input v-model="form.hidden_danger__check_location" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查内容">
<el-input v-model="form.hidden_danger__check_content" type="textarea" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患描述" prop="hidden_danger__check_problem">
<el-input v-model="form.hidden_danger__check_problem" type="textarea" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改人">
<el-input v-model="form.hidden_danger__reform_man" placeholder="请选择整改人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformManVisible = !reformManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改部门">
<el-input v-model="form.hidden_danger__reform_dept" placeholder="请选择检查部门" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reformDeptVisible = !reformDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改期限">
<el-date-picker
v-model="form.hidden_danger__reform_limit"

View File

@ -2,7 +2,7 @@
<div>
<el-card>
<div class="buttons">
<buttons funid="hidden_check" style="margin-bottom:20px" @save="save" />
<buttons funid="hidden_check" style="margin-bottom:20px" @save="save" @upload="upload" />
<el-button type="primary" @click="back">返回列表</el-button>
</div>
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
@ -10,12 +10,12 @@
<div class="classify-title">| <span>隐患排查</span></div>
</div>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患编号">
<el-input v-model="form.hidden_danger__hidden_code" :disabled="!disabled" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="巡检状态">
<el-select v-model="form.hidden_danger__hidden_state" placeholder="请选择" :disabled="!disabled">
<el-option
@ -27,7 +27,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查人">
<el-input v-model="form.hidden_danger__check_man" placeholder="请选择检查人" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="checkManVisible = !checkManVisible" />
@ -36,14 +36,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查部门">
<el-input v-model="form.hidden_danger__check_dept" placeholder="请选择检查部门" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="checkDeptVisible = !checkDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查时间">
<el-date-picker
v-model="form.hidden_danger__check_date"
@ -56,40 +56,40 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查地点">
<el-input v-model="form.hidden_danger__check_location" :disabled="!disabled" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="检查内容">
<el-input v-model="form.hidden_danger__check_content" type="textarea" :disabled="!disabled" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="隐患描述" prop="hidden_danger__check_problem">
<el-input v-model="form.hidden_danger__check_problem" type="textarea" :disabled="!disabled" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改人">
<el-input v-model="form.hidden_danger__reform_man" placeholder="请选择整改人" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="reformManVisible = !reformManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改部门">
<el-input v-model="form.hidden_danger__reform_dept" placeholder="请选择检查部门" class="input-with-select" clearable :disabled="!disabled">
<el-button slot="append" icon="el-icon-search" @click="reformDeptVisible = !reformDeptVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改期限">
<el-date-picker
v-model="form.hidden_danger__reform_limit"
@ -107,7 +107,7 @@
<div class="classify-title">| <span>隐患整改</span></div>
</div>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改时间" prop="hidden_danger__reform_date">
<el-date-picker
v-model="form.hidden_danger__reform_date"
@ -120,12 +120,12 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="投入费用">
<el-input v-model="form.hidden_danger__reform_money" placeholder="请输入安全投入费用" class="input-with-select" clearable :disabled="!disabled" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="整改情况">
<el-input v-model="form.hidden_danger__reform_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable :disabled="!disabled" />
</el-form-item>
@ -135,7 +135,7 @@
<div class="classify-title">| <span>隐患验收</span></div>
</div>
<el-row>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="验收时间" prop="hidden_danger__review_date">
<el-date-picker
v-model="form.hidden_danger__review_date"
@ -147,14 +147,14 @@
/>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="验收人">
<el-input v-model="form.hidden_danger__review_man" placeholder="请选择验收人" class="input-with-select" clearable>
<el-button slot="append" icon="el-icon-search" @click="reviewManVisible = !reviewManVisible" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="8">
<el-form-item label="验收情况">
<el-input v-model="form.hidden_danger__review_desc" placeholder="请输入整改情况" class="input-with-select" type="textarea" clearable maxlength="500" />
</el-form-item>
@ -162,6 +162,14 @@
</el-row>
</el-form>
</el-card>
<el-row>
<el-col class="img" :span="12">
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_check" title="隐患整改图片" />
</el-col>
<el-col class="img" :span="12">
<ShowImages :data-id="id" table-name="hidden_danger" fun-id="hidden_review" title="隐患验收图片" />
</el-col>
</el-row>
<el-dialog
v-if="checkManVisible"
title="选择人员"
@ -226,6 +234,12 @@
<el-button type="primary" @click="selReformDept"> </el-button>
</span>
</el-dialog>
<el-dialog v-if="dialogUploadVisible" title="附件" :visible.sync="dialogUploadVisible" width="45%" @close="closeUploadDialog">
<Attach ref="attach" :data-id="[id]" table-name="hidden_danger" fun-id="hidden_check" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogUploadVisible = false">返回</el-button>
</div>
</el-dialog>
</div>
</template>
@ -235,12 +249,16 @@ import publicApi from '@/api/public'
import buttons from '@/components/formBtn'
import SelUser from '@/components/selUser'
import SelDept from '@/components/selDept'
import ShowImages from '@/components/show_images'
import Attach from '@/components/sys_attach'
export default {
name: 'HiddenReviewAuditForm',
components: {
buttons,
SelUser,
SelDept
SelDept,
ShowImages,
Attach
},
// props: {
// id: { type: String, default: () => '' }
@ -290,6 +308,7 @@ export default {
checkDeptVisible: false,
reformDeptVisible: false,
reviewManVisible: false,
dialogUploadVisible: false,
hiddenState: []
}
},
@ -320,6 +339,12 @@ export default {
}
})
},
upload() {
this.dialogUploadVisible = true
},
closeUploadDialog() {
this.dialogUploadVisible = false
},
onSubmit() {},
getCheckMan(data) {
this.form.hidden_danger__check_man = data.sys_user__user_name
@ -435,9 +460,6 @@ export default {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.el-col{
margin-left: 2%;
}
.buttons {
display: flex;
.el-button--primary {