Skip to content

S
sgaqgl-vue
Commit b4f26974 authored by 李苏's avatar 李苏 💬
Browse files
Options

隐患整改

parent 29dca19d
Show whitespace changes
Inline Side-by-side
Showing with 491 additions and 480 deletions
src/views/dangerManagement/dangerRectificationRecord/edit.vue
View file @ b4f26974
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容，slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="发现日期" ref="fxrq" prop="fxrq">
......@@ -14,46 +14,64 @@
<el-form-item label="风险点" ref="fxd" prop="fxd">
<el-input :readonly="readonly" v-model="form.fxd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="隐患地点" ref="yhdd" prop="yhdd">
<el-input :readonly="readonly" v-model="form.yhdd" ></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="上报级别" ref="sbjb" prop="sbjb">
<RelSelect :readonly="readonly" style="width: 100%;" src='/aqgl/fxyk/fxpc/init/glcj' clearable :match="{value:'id',label:'name'}" v-model='form.sbjb' ></RelSelect>
<el-col :span="12">
<el-form-item label="隐患类型" ref="flid" prop="flid">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="12">
<el-form-item label="上报人" ref="sbjb" prop="sbjb">
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
<el-form-item label="隐患等级" ref="dj" prop="dj">
<RelSelect style='width: 100%;' src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任人" ref="zrr" prop="zrr">
<personSelector :label="form.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
<el-col :span="24">
<el-form-item label="隐患内容" ref="nr" prop="nr">
<el-input type='textarea' :readonly="readonly" v-model="form.nr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="整改措施" ref="zgfa" prop="zgfa">
<el-input type='textarea' :readonly="readonly" v-model="form.zgfa" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="管控措施" ref="gkcs" prop="gkcs">
<el-input type='textarea' :readonly="readonly" v-model="form.gkcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="整改说明" ref="clff" prop="clff">
<el-input type='textarea' :readonly="readonly" v-model="form.clff" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="隐患等级" ref="dj" prop="dj">
<el-input :readonly="readonly" v-model="form.dj" ></el-input>
<el-form-item label="整改完成日期" ref="yqzgsj" prop="yqzgsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.yqzgsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患分类" ref="flid" prop="flid">
<RelSelect style='width:100%' src='aqgl/yhgl/yhfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.flid" ></el-input> -->
<el-form-item label="上报人" ref="sbr" prop="sbr">
<!-- <el-input :readonly="readonly" v-model="form.zrr" ></el-input> -->
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -71,6 +89,7 @@
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
/* 赋值*/
this.form.sbr=localStorage.getItem('userid')
this.form.sbrName=localStorage.getItem('username')
},
......@@ -81,11 +100,18 @@
data() {
return {
/* 额外初始化，根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
sbr:"",
clff:'',
sbr:'',
sbrName:'',
gkcs:'',
zgfa:'',
zrrName:'',
id:'',
......@@ -110,7 +136,7 @@
flid:'',
clr:'',
yqzgsj:new Date().getTime(),
clsj:new Date().getTime(),
clff:'',
......@@ -173,9 +199,6 @@
methods: {
sbrSelected(row){
this.form.sbr=row.id
},
zrrSelected(row){
this.form.zrr=row.id
}
}
}
......
src/views/dangerManagement/dangerRectificationRecord/index.vue
View file @ b4f26974
<template>
<div class="min_full">
<Zgwc :app='this' v-if="showDialog" ></Zgwc>
<!-- 查询条件-->
<!-- 查询条件-->
<div class="search" v-condition >
......@@ -25,8 +26,9 @@
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">隐患分类:</span>
<RelSelect src='aqgl/yhgl/yhfl/query' clearable :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
<span class="search-span">上报人:</span>
<el-input v-model='queryParams.sbr' ></el-input>
<!-- <RelSelect src='aqgl/yhgl/yhfl/query' clearable :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect> -->
</div>
</el-col>
</el-row>
......@@ -37,8 +39,9 @@
<ViewButton ref="view" :app='app'></ViewButton>
<EditButton ref="edit" :app='app'></EditButton>
<DeleteButton :app='app'></DeleteButton>
<AttachFileButton :app='app' ></AttachFileButton>
<WorkFlowButton :app='app' ></WorkFlowButton>
<el-button size='mini' @click="zdzrr" type="primary">整改完成</el-button>
<!-- <AttachFileButton :app='app' ></AttachFileButton>
<WorkFlowButton :app='app' ></WorkFlowButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 权限-->
......@@ -57,6 +60,7 @@
<script>
/* 引入需要的接口*/
import Zgwc from './zgwc'
import {
doQuery,
doAdd,
......@@ -77,6 +81,9 @@
},
data() {
return {
DialogTitle:'整改完成',
/*需要的额外参数 */
showDialog:false,
/* 基础url*/
baseUrl: '/aqgl/yhgl/yhjl',
/* 查询参数*/
......@@ -84,7 +91,7 @@
ksrq:new Date().getTime()-1000*60*60*24*30,
jsrq:new Date().getTime(),
bmid:'',
flid:''
sbr:''
},
/* 树的标题 */
treeTitle: '隐患标准分类',
......@@ -94,22 +101,40 @@
},
/* 表格标题对应参数*/
tableTitle: [
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
//
{label: "状态", prop: "zt", fieldType: "ftString",transform:{
url:'aqgl/yhgl/yhjl/init/zt',label:'name',value:'id'
}},
{label: "整改说明", prop: "clff", fieldType: "ftString",width:300},
{label: "整改完成时间", prop: "clsj", fieldType: "ftDateTime"},
{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
{label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
// {label: "上报级别", prop: "sbjb", fieldType: "ftString",width:100},
// {label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
{label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{
url:'aqgl/yhgl/yhfl/query',label:'name',value:'id'
}},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192,transform:{
url:'aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'
}},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
// {label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192},
{label: "隐患分类", prop: "pidName", fieldType: "ftString",width:192},
// {label: "处理人", prop: "clr", fieldType: "ftString",width:192},
{label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
{label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
{label: "要求整改完成时间", prop: "yqzgsj", fieldType: "ftDateTime"},
// {label: "隐患分类", prop: "flid", fieldType: "ftString",width:192},
{label: "处理人", prop: "clrName", fieldType: "ftString",width:192},
// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
// {label: "复查人", prop: "fcr", fieldType: "ftString",width:192},
{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192},
{label: "上报人", prop: "sbrName", fieldType: "ftString",width:192},
/* 检查人 */
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
// {label: "处置人", prop: "czr", fieldType: "ftString",width:192},
......@@ -119,14 +144,21 @@
// {label: "附件数", prop: "attachcount", fieldType: "int"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "上报人", prop: "sbrName", fieldType: "ftString"},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
}
},
methods: {
zdzrr(){
if (this.app.selectOne || this.app.clickOne) {
this.showDialog = true
} else {
this.$warning('请选中一行操作');
}
},
selectedTree(e){
this.queryParams.bmid=e.id||'root'
this.$refs['TablePager'].pageQuery()
......@@ -153,7 +185,7 @@
},
components:{
Edit
Edit,Zgwc
}
......
src/views/dangerManagement/dangerReviewRecord/edit.vue
View file @ b4f26974
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容，slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-form slot="form" style="height: 65vh;overflow: auto;overflow-x: hidden;padding-right: 20px;" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="发现日期" ref="fxrq" prop="fxrq">
......@@ -15,133 +15,75 @@
<el-input :readonly="readonly" v-model="form.fxd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="隐患地点" ref="yhdd" prop="yhdd">
<el-input :readonly="readonly" v-model="form.yhdd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上报人" ref="sbr" prop="sbr">
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="内容" ref="nr" prop="nr">
<el-input :readonly="readonly" v-model="form.nr" ></el-input>
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="12">
<el-form-item label="责任部门" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='/kzzx/bm/query' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="制定整改方案" ref="zdzgfa" prop="zdzgfa">
<el-input :readonly="readonly" v-model="form.zdzgfa" ></el-input>
<el-form-item label="隐患类型" ref="flid" prop="flid">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任人" ref="zrr" prop="zrr">
<el-input :readonly="readonly" v-model="form.zrr" ></el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="隐患等级" ref="dj" prop="dj">
<RelSelect :readonly="readonly" style='width: 100%;' src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></RelSelect>
<RelSelect style='width: 100%;' src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患分类" ref="flid" prop="flid">
<RelSelect style='width:100%' src='aqgl/yhgl/yhfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复查人" ref="fcr" prop="fcr">
<personSelector :label="form.fcrName||'暂无'" @selected='fcrSelected' ></personSelector>
<el-col :span="24">
<el-form-item label="隐患内容" ref="nr" prop="nr">
<el-input type='textarea' :readonly="readonly" v-model="form.nr" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="处理人" ref="clr" prop="clr">
<personSelector :label="form.clrName||'暂无'" @selected='clrSelected' ></personSelector>
<el-col :span="24">
<el-form-item label="整改措施" ref="zgfa" prop="zgfa">
<el-input type='textarea' :readonly="readonly" v-model="form.zgfa" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处理时间" ref="clsj" prop="clsj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.clsj" placeholder="选择日期">
</el-date-picker>
<el-col :span="24">
<el-form-item label="管控措施" ref="gkcs" prop="gkcs">
<el-input type='textarea' :readonly="readonly" v-model="form.gkcs" ></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="处理方法" ref="clff" prop="clff">
<el-input :readonly="readonly" v-model="form.clff" ></el-input>
<el-col :span="24">
<el-form-item label="整改说明" ref="clff" prop="clff">
<el-input type='textarea' :readonly="readonly" v-model="form.clff" ></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="复查时间" ref="fcsj" prop="fcsj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fcsj" placeholder="选择日期">
</el-date-picker>
</el-col>
<el-col :span="24">
<el-form-item label="复查说明" ref="fcsm" prop="fcsm">
<el-input type='textarea' :readonly="readonly" v-model="form.fcsm" ></el-input>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="12">
<el-form-item label="复查结果" ref="fcjg" prop="fcjg">
<el-input :readonly="readonly" v-model="form.fcjg" ></el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="处置人" ref="czr" prop="czr">
<personSelector :label="form.czrName||'暂无'" @selected='czrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.czr" ></el-input> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处置时间" ref="czsj" prop="czsj">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.czsj" placeholder="选择日期">
<el-form-item label="整改完成日期" ref="yqzgsj" prop="yqzgsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.yqzgsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="处置意见" ref="czyj" prop="czyj">
<el-input :readonly="readonly" v-model="form.czyj" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="附件数" ref="attachcount" prop="attachcount">
<el-input :readonly="readonly" v-model="form.attachcount" ></el-input>
<el-form-item label="上报人" ref="sbr" prop="sbr">
<!-- <el-input :readonly="readonly" v-model="form.zrr" ></el-input> -->
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input type="textarea" :readonly="readonly" v-model="form.bz" ></el-input>
<el-input type='textarea' :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="工作流状态" ref="wfpname" prop="wfpname">
<el-input :readonly="readonly" v-model="form.wfpname" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col> -->
</el-row>
</el-form>
</RelDialog>
......@@ -152,11 +94,12 @@
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
/* 赋值*/
this.form.sbr=localStorage.getItem('userid')
this.form.sbrName=localStorage.getItem('username')
},
/* 组件名称*/
name: "yhglYhjlEdit",
name: "aqgl/yhglYhjlEdit",
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() {
......@@ -169,11 +112,13 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
czrName:'',
clrName:'',
fcrName:'',
sbrName:'',
fcsm:'',
clff:'',
sbr:'',
sbrName:'',
gkcs:'',
zgfa:'',
zrrName:'',
id:'',
fxrq:new Date().getTime(),
......@@ -197,7 +142,7 @@
flid:'',
clr:'',
yqzgsj:new Date().getTime(),
clsj:new Date().getTime(),
clff:'',
......@@ -260,15 +205,6 @@
methods: {
sbrSelected(row){
this.form.sbr=row.id
},
fcrSelected(row){
this.form.fcr=row.id
},
clrSelected(row){
this.form.clr=row.id
},
czrSelected(row){
this.form.czr=row.id
}
}
}
......
src/views/dangerManagement/dangerReviewRecord/index.vue
View file @ b4f26974
<template>
<div class="min_full">
<Fcjg :app='this' v-if="showDialog" ></Fcjg>
<!-- 查询条件-->
<div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
......@@ -36,13 +36,13 @@
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton> -->
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app' ></AttachFileButton>
<!-- <AttachFileButton :app='app' ></AttachFileButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<WorkFlowButton :app='app' ></WorkFlowButton>
<el-button size='mini' @click="zdzrr" type="primary">复查结果</el-button>
<!-- 额外按钮-->
<!-- 表头设置 -->
......@@ -59,6 +59,7 @@
</template>
<script>
import Fcjg from './fcjg'
/* 引入需要的接口*/
import {
doQuery,
......@@ -82,11 +83,10 @@
data() {
return {
DialogTitle:'复查',
/*需要的额外参数 */
showDialog: false,
DialogName: '',
showDialog:false,
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
/* 查询参数*/
......@@ -98,40 +98,66 @@
},
/* 表格标题对应参数*/
tableTitle: [
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
//
{label: "状态", prop: "zt", fieldType: "ftString",transform:{
url:'aqgl/yhgl/yhjl/init/zt',label:'name',value:'id'
}},
{label: "复查时间", prop: "fcsj", fieldType: "ftDateTime",width:300},
{label: "复查说明", prop: "fcsm", fieldType: "ftString",width:300},
{label: "整改说明", prop: "clff", fieldType: "ftString",width:300},
{label: "整改完成时间", prop: "clsj", fieldType: "ftDateTime"},
{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
{label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
// {label: "上报级别", prop: "sbjb", fieldType: "ftString",width:100},
// {label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
{label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{
url:'aqgl/yhgl/yhfl/query',label:'name',value:'id'
}},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192,transform:{
url:'aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'
}},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
// {label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
// {label: "责任人", prop: "zrr", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192},
{label: "隐患分类", prop: "yhflName", fieldType: "ftString",width:192},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
{label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
{label: "要求整改完成时间", prop: "yqzgsj", fieldType: "ftDateTime"},
// {label: "隐患分类", prop: "flid", fieldType: "ftString",width:192},
{label: "处理人", prop: "clrName", fieldType: "ftString",width:192},
{label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192},
{label: "上报人", prop: "sbrName", fieldType: "ftString",width:192},
/* 检查人 */
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
{label: "处置人", prop: "czrName", fieldType: "ftString",width:192},
{label: "处置时间", prop: "czsj", fieldType: "ftDateTime"},
// {label: "处置人", prop: "czr", fieldType: "ftString",width:192},
// {label: "处置时间", prop: "czsj", fieldType: "ftDateTime"},
// {label: "处置意见", prop: "czyj", fieldType: "ftString",width:300},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "附件数", prop: "attachcount", fieldType: "int"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "上报人", prop: "sbrName", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
}
},
methods: {
zdzrr(){
if (this.app.selectOne || this.app.clickOne) {
this.showDialog = true
} else {
this.$warning('请选中一行操作');
}
},
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
......@@ -147,7 +173,7 @@
},
components: {
Edit,
Edit,Fcjg
}
......
src/views/dangerManagement/enterSafetyRecords/edit.vue
View file @ b4f26974
......@@ -22,7 +22,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="隐患类型" ref="flid" prop="flid">
<RelSelect :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -54,14 +54,16 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="整改完成日期" ref="zdzgfa" prop="zdzgfa">
<el-input :readonly="readonly" v-model="form.zdzgfa" ></el-input>
<el-form-item label="整改完成日期" ref="yqzgsj" prop="yqzgsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.yqzgsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任人" ref="zrr" prop="zrr">
<el-form-item label="上报人" ref="sbr" prop="sbr">
<!-- <el-input :readonly="readonly" v-model="form.zrr" ></el-input> -->
<personSelector :label="form.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
</el-form-item>
</el-col>
......@@ -83,8 +85,8 @@
/* 存放index页面传递的额外参数*/
mounted() {
/* 赋值*/
this.form.zrr=localStorage.getItem('userid')
this.form.zrrName=localStorage.getItem('username')
this.form.sbr=localStorage.getItem('userid')
this.form.sbrName=localStorage.getItem('username')
},
/* 组件名称*/
name: "aqgl/yhglYhjlEdit",
......@@ -100,6 +102,8 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
sbr:'',
sbrName:'',
gkcs:'',
zgfa:'',
zrrName:'',
......@@ -126,7 +130,7 @@
flid:'',
clr:'',
yqzgsj:new Date().getTime(),
clsj:new Date().getTime(),
clff:'',
......@@ -187,8 +191,8 @@
}
},
methods: {
zrrSelected(row){
this.form.zrr=row.id
sbrSelected(row){
this.form.sbr=row.id
}
}
}
......
src/views/dangerManagement/enterSafetyRecords/index.vue
View file @ b4f26974
......@@ -39,8 +39,8 @@
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<DeleteButton :app='app'></DeleteButton>
<AttachFileButton :app='app'></AttachFileButton>
<WorkFlowButton :app='app'></WorkFlowButton>
<!-- <AttachFileButton :app='app'></AttachFileButton>
<WorkFlowButton :app='app'></WorkFlowButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 权限-->
......@@ -82,7 +82,7 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
......@@ -116,12 +116,14 @@
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "要求整改完成时间", prop: "yqzgsj", fieldType: "ftDateTime"},
/* 要求整改完成时间 */
{label: "处理人", prop: "clrName", fieldType: "ftString",width:192},
// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
{label: "复查人", prop: "fcr", fieldType: "ftString",width:192},
{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192},
{label: "上报人", prop: "sbrName", fieldType: "ftString",width:192},
/* 检查人 */
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
......@@ -142,7 +144,7 @@
methods: {
selectedTree(e){
this.queryParams.flid=e.id||'root'
this.$refs['TablePager'].pageQuery()
},
tybz(a) {
let nTy = false
......
src/views/dangerManagement/queryDangerRecords/edit.vue
View file @ b4f26974
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容，slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules" style="height: 60vh;overflow: auto;overflow-x: hidden;padding-right: 20px;">
<el-form slot="form" style="height: 65vh;overflow: auto;overflow-x: hidden;padding-right: 20px;" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="发现日期" ref="fxrq" prop="fxrq">
......@@ -15,14 +15,14 @@
<el-input :readonly="readonly" v-model="form.fxd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="隐患地点" ref="yhdd" prop="yhdd">
<el-input :readonly="readonly" v-model="form.yhdd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
<el-form-item label="隐患类型" ref="flid" prop="flid">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -30,105 +30,58 @@
<RelSelect style='width: 100%;' src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="12">
<el-form-item label="责任部门" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='/kzzx/bm/query' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="制定整改方案" ref="zdzgfa" prop="zdzgfa">
<el-input :readonly="readonly" v-model="form.zdzgfa" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任人" ref="zrr" prop="zrr">
<personSelector :label="form.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.zrr" ></el-input> -->
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="隐患分类" ref="flid" prop="flid">
<RelSelect style='width: 100%;' src='aqgl/yhgl/yhfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处理人" ref="clr" prop="clr">
<personSelector :label="form.clrName||'暂无'" @selected='clrSelected' ></personSelector>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处理时间" ref="clsj" prop="clsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.clsj" placeholder="选择日期">
</el-date-picker>
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处理方法" ref="clff" prop="clff">
<el-input :readonly="readonly" v-model="form.clff" ></el-input>
<el-col :span="24">
<el-form-item label="隐患内容" ref="nr" prop="nr">
<el-input type='textarea' :readonly="readonly" v-model="form.nr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚金额" ref="cfje" prop="cfje">
<el-input :readonly="readonly" v-model="form.cfje" ></el-input>
<el-col :span="24">
<el-form-item label="整改措施" ref="zgfa" prop="zgfa">
<el-input type='textarea' :readonly="readonly" v-model="form.zgfa" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上报人" ref="sbr" prop="sbr">
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.sbr" ></el-input> -->
<el-col :span="24">
<el-form-item label="管控措施" ref="gkcs" prop="gkcs">
<el-input type='textarea' :readonly="readonly" v-model="form.gkcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复查人" ref="fcr" prop="fcr">
<personSelector :label="form.fcrName||'暂无'" @selected='fcrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.fcr" ></el-input> -->
<el-col :span="24">
<el-form-item label="整改说明" ref="clff" prop="clff">
<el-input type='textarea' :readonly="readonly" v-model="form.clff" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复查时间" ref="fcsj" prop="fcsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fcsj" placeholder="选择日期">
</el-date-picker>
<el-col :span="24">
<el-form-item label="复查说明" ref="fcsm" prop="fcsm">
<el-input type='textarea' :readonly="readonly" v-model="form.fcsm" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="要求整改日期" ref="yqzgsj" prop="yqzgsj">
<el-form-item label="整改完成日期" ref="yqzgsj" prop="yqzgsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.yqzgsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处置时间" ref="czsj" prop="czsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.czsj" placeholder="选择日期">
</el-date-picker>
<el-form-item label="上报人" ref="sbr" prop="sbr">
<!-- <el-input :readonly="readonly" v-model="form.zrr" ></el-input> -->
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="复查结果" ref="fcjg" prop="fcjg">
<el-input :readonly="readonly" v-model="form.fcjg" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处置人" ref="czr" prop="czr">
<!-- <el-input :readonly="readonly" v-model="form.czr" ></el-input> -->
<personSelector :label="form.czrName||'暂无'" @selected='czrSelected' ></personSelector>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="处置意见" ref="czyj" prop="czyj">
<el-input type="textarea" :readonly="readonly" v-model="form.czyj" ></el-input>
<el-form-item label="备注" ref="bz" prop="bz">
<el-input type='textarea' :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -141,11 +94,12 @@
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
/* 赋值*/
this.form.sbr=localStorage.getItem('userid')
this.form.sbrName=localStorage.getItem('username')
},
/* 组件名称*/
name: "yhglYhjlEdit",
name: "aqgl/yhglYhjlEdit",
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() {
......@@ -158,14 +112,13 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
zrrName:'',
czrName:'',
clrName:'',
fcrName:'',
fcsm:'',
clff:'',
sbr:'',
sbrName:'',
yqzgsj:'',
sbr:"",
cfje:'',
gkcs:'',
zgfa:'',
zrrName:'',
id:'',
fxrq:new Date().getTime(),
......@@ -189,7 +142,7 @@
flid:'',
clr:'',
yqzgsj:new Date().getTime(),
clsj:new Date().getTime(),
clff:'',
......@@ -252,18 +205,6 @@
methods: {
sbrSelected(row){
this.form.sbr=row.id
},
fcrSelected(row){
this.form.fcr=row.id
},
clrSelected(){
this.form.clr=row.id
},
czrSelected(){
this.form.czr=row.id
},
zrrSelected(){
this.form.zrr=row.id
}
}
}
......
src/views/dangerManagement/queryDangerRecords/index.vue
View file @ b4f26974
<template>
<div style="display: flex;">
<div class="min_full" style="width: 200px;border-right: 0px;">
<TreeBase :app='app' @selected='selectedTree'></TreeBase>
</div>
<div class="min_full" style="width: calc(100% - 200px)">
<div class="min_full" >
<!-- 查询条件-->
<div class="search" v-condition >
<SearchButton :app='app'></SearchButton>
......@@ -33,6 +30,19 @@
<span class="search-span">处理状态:</span>
<RelSelect src='aqgl/yhgl/yhjl/init/zt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<el-checkbox v-model="queryParams.yq" true-label='Y' false-label="N" >逾期</el-checkbox>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">风险点:</span>
<el-input v-model="queryParams.fxd"></el-input>
</div>
</el-col>
</el-row>
</div>
......@@ -40,10 +50,10 @@
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<DeleteButton :app='app'></DeleteButton>
<EditButton ref="edit" :app='app'></EditButton> -->
<!-- <DeleteButton :app='app'></DeleteButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<AttachFileButton :app='app' ></AttachFileButton>
......@@ -52,13 +62,12 @@
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
<TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
</div>
</div>
</div>
</template>
......@@ -85,7 +94,7 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
......@@ -102,7 +111,9 @@
ksrq:new Date().getTime()-1000*60*60*24*30,
jsrq:new Date().getTime(),
bmid:'',
zt:''
zt:'',
yq:'N',
fxd:''
},
/* 树的标题 */
treeTitle: '单位列表',
......@@ -112,36 +123,56 @@
},
/* 表格标题对应参数*/
tableTitle: [
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
//
// {label: "状态", prop: "zt", fieldType: "ftString",transform:{
// url:'aqgl/yhgl/yhjl/init/zt',label:'name',value:'id'
// }},
// {label: "整改说明", prop: "clff", fieldType: "ftString",width:300},
// {label: "整改完成时间", prop: "clsj", fieldType: "ftDateTime"},
{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
/* */
{label: "整改日期", prop: "clsj", fieldType: "ftDateTime"},
{label: "复查日期", prop: "fcsj", fieldType: "ftDateTime"},
/* */
{label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
{label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{
url:'aqgl/yhgl/yhfl/query',label:'name',value:'id'
}},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192,transform:{
url:'aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'
}},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
// {label: "责任部门", prop: "bmid", fieldType: "ftString",width:192},
{label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:120},
// {label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192},
{label: "隐患分类", prop: "flid", fieldType: "ftString",width:192},
{label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
{label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
{label: "要求整改完成时间", prop: "yqzgsj", fieldType: "ftDateTime"},
// {label: "隐患分类", prop: "flid", fieldType: "ftString",width:192},
{label: "处理人", prop: "clrName", fieldType: "ftString",width:192},
{label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
{label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192},
{label: "上报人", prop: "sbrName", fieldType: "ftString",width:192},
/* 检查人 */
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
{label: "处置人", prop: "czrName", fieldType: "ftString",width:192},
{label: "处置时间", prop: "czsj", fieldType: "ftDateTime"},
// {label: "处置人", prop: "czr", fieldType: "ftString",width:192},
// {label: "处置时间", prop: "czsj", fieldType: "ftDateTime"},
// {label: "处置意见", prop: "czyj", fieldType: "ftString",width:300},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "附件数", prop: "attachcount", fieldType: "int"},
// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "上报人", prop: "sbrName", fieldType: "ftString"},
{label: "要求整改日期", prop: "yqzgsj", fieldType: "ftString"},
{label: "处罚金额", prop: "cfje", fieldType: "ftString"},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
}
......
src/views/dangerManagement/safetyDisposalRecord/edit.vue
View file @ b4f26974
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容，slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="发现日期" ref="fxrq" prop="fxrq">
......@@ -15,51 +15,59 @@
<el-input :readonly="readonly" v-model="form.fxd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="隐患地点" ref="yhdd" prop="yhdd">
<el-input style='width: 100%;' :readonly="readonly" v-model="form.yhdd" ></el-input>
<el-input :readonly="readonly" v-model="form.yhdd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="内容" ref="nr" prop="nr">
<el-input type='textarea' :readonly="readonly" v-model="form.nr" ></el-input>
<el-col :span="12">
<el-form-item label="隐患类型" ref="flid" prop="flid">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患等级" ref="dj" prop="dj">
<RelSelect style='width: 100%;' src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任人" ref="zrr" prop="zrr">
<personSelector :label="form.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
<el-col :span="24">
<el-form-item label="隐患内容" ref="nr" prop="nr">
<el-input type='textarea' :readonly="readonly" v-model="form.nr" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="隐患等级" ref="dj" prop="dj">
<RelSelect style='width: 100%;' src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.dj" ></el-input> -->
<el-form-item label="整改措施" ref="zgfa" prop="zgfa">
<el-input type='textarea' :readonly="readonly" v-model="form.zgfa" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="管控措施" ref="gkcs" prop="gkcs">
<el-input type='textarea' :readonly="readonly" v-model="form.gkcs" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="处理人" ref="clr" prop="clr">
<personSelector :label="form.clrName||'暂无'" @selected='clrSelected' ></personSelector>
<el-form-item label="整改完成日期" ref="yqzgsj" prop="yqzgsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.yqzgsj" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复查时间" ref="fcsj" prop="fcsj">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fcsj" placeholder="选择日期">
</el-date-picker>
<el-form-item label="上报人" ref="sbr" prop="sbr">
<!-- <el-input :readonly="readonly" v-model="form.zrr" ></el-input> -->
<personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz">
......@@ -76,7 +84,9 @@
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
/* 赋值*/
this.form.sbr=localStorage.getItem('userid')
this.form.sbrName=localStorage.getItem('username')
},
/* 组件名称*/
name: "aqgl/yhglYhjlEdit",
......@@ -92,7 +102,10 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
clrName:'',
sbr:'',
sbrName:'',
gkcs:'',
zgfa:'',
zrrName:'',
id:'',
......@@ -117,7 +130,7 @@
flid:'',
clr:'',
yqzgsj:new Date().getTime(),
clsj:new Date().getTime(),
clff:'',
......@@ -178,11 +191,8 @@
}
},
methods: {
zrrSelected(row){
this.form.zrr=row.id
},
clrSelected(row){
this.form.clr=row.id
sbrSelected(row){
this.form.sbr=row.id
}
}
}
......
src/views/dangerManagement/safetyDisposalRecord/index.vue
View file @ b4f26974
<template>
<div style="display: flex;">
<div class="min_full" style="width: 200px;border-right: 0px;">
<TreeBase :app='app' @selected='selectedTree'></TreeBase>
</div>
<div class="min_full" style="width: calc(100% - 200px)">
<div class="min_full" >
<Zdzrr :app='this' v-if="showDialog" ></Zdzrr>
<!-- 查询条件-->
<div class="search" v-condition >
<SearchButton :app='app'></SearchButton>
......@@ -22,10 +20,8 @@
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">责任单位:</span>
<RelSelect style="width: 100%;" src='/kzzx/bm/query' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.zrdw' ></RelSelect>
<!-- <el-input v-model="queryParams.zrdw"
size="small" class="search-input"></el-input> -->
<span class="search-span">班组:</span>
<RelSelect style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col">
......@@ -40,6 +36,7 @@
<el-row class="tool-bar">
<ViewButton ref="view" :app='app'></ViewButton>
<AttachFileButton :app='app' ></AttachFileButton>
<el-button size='mini' @click="zdzrr" type="primary">指定责任人</el-button>
<!-- 权限-->
</el-row>
......@@ -51,12 +48,12 @@
</div>
</div>
</div>
</template>
<script>
import Zdzrr from './zdzrr'
/* 引入需要的接口*/
import {
doQuery,
......@@ -78,48 +75,53 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
DialogTitle:'指定责任人',
/*需要的额外参数 */
showDialog:false,
/* 基础url*/
baseUrl: '/aqgl/yhgl/yhjl',
/* 查询参数*/
queryParams: {
ksrq:new Date().getTime()-60*1000*60*24*30,
jsrq:new Date().getTime(),
zrdw:'',
bmid:'',
flid:''
},
/* 树的标题 */
treeTitle: '单位列表',
treeDefaultProps: {
children: 'children',
label: 'bmmc'
},
/* 表格标题对应参数*/
/* 表格标题对应参数*/
tableTitle: [
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
{label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
{label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{
url:'aqgl/yhgl/yhfl/query',label:'name',value:'id'
}},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192,transform:{
url:'aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'
}},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
// {label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "yhdjName", fieldType: "ftString",width:192},
{label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
{label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
{label: "要求整改完成时间", prop: "yqzgsj", fieldType: "ftDateTime"},
// {label: "隐患分类", prop: "flid", fieldType: "ftString",width:192},
{label: "处理人", prop: "clrName", fieldType: "ftString",width:192},
// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
// {label: "复查人", prop: "fcr", fieldType: "ftString",width:192},
{label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192},
{label: "上报人", prop: "sbrName", fieldType: "ftString",width:192},
/* 检查人 */
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
// {label: "处置人", prop: "czr", fieldType: "ftString",width:192},
// {label: "处置时间", prop: "czsj", fieldType: "ftDateTime"},
......@@ -128,17 +130,20 @@
// {label: "附件数", prop: "attachcount", fieldType: "int"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
}
},
methods: {
selectedTree(e){
this.queryParams.bmid=e.id||'root'
this.$refs['TablePager'].pageQuery()
zdzrr(){
if (this.app.selectOne || this.app.clickOne) {
this.showDialog = true
} else {
this.$warning('请选中一行操作');
}
},
query: doQuery,
/* 基础增*/
......@@ -158,7 +163,8 @@
},
components:{
Edit
Edit,
Zdzrr
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment