Skip to content

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

隐患

parent d7d205cf
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 95 deletions
src/views/dangerManagement/dangerRectificationRecord/edit.vue
View file @ 29dca19d
......@@ -21,11 +21,11 @@
<el-input :readonly="readonly" v-model="form.yhdd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <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-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>
......@@ -34,8 +34,8 @@
</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 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">
......
src/views/dangerManagement/dangerRectificationRecord/index.vue
View file @ 29dca19d
......@@ -19,8 +19,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>
<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">
......@@ -83,7 +83,7 @@
queryParams: {
ksrq:new Date().getTime()-1000*60*60*24*30,
jsrq:new Date().getTime(),
zrdw:'',
bmid:'',
flid:''
},
/* 树的标题 */
......@@ -97,9 +97,11 @@
{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: "sbjb", fieldType: "ftString",width:100},
// {label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192},
......
src/views/dangerManagement/dangerReviewRecord/edit.vue
View file @ 29dca19d
......@@ -21,9 +21,8 @@
</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-input :readonly="readonly" v-model="form.sbjb" ></el-input> -->
<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">
......@@ -38,11 +37,11 @@
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<!-- <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> -->
<!-- <el-col :span="12">
<el-form-item label="制定整改方案" ref="zdzgfa" prop="zdzgfa">
<el-input :readonly="readonly" v-model="form.zdzgfa" ></el-input>
......
src/views/dangerManagement/dangerReviewRecord/index.vue
View file @ 29dca19d
......@@ -19,8 +19,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>
<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">
......@@ -93,7 +93,7 @@
queryParams: {
ksrq: new Date().getTime()-1000*60*60*24*30,
jsrq: new Date().getTime(),
zrdw:'',
bmid:'',
sbr:''
},
/* 表格标题对应参数*/
......@@ -101,9 +101,11 @@
{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: "sbjb", fieldType: "ftString",width:100},
// {label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
// {label: "责任人", prop: "zrr", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192},
......
src/views/dangerManagement/enterSafetyRecords/edit.vue
View file @ 29dca19d
......@@ -21,25 +21,40 @@
</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-input :readonly="readonly" v-model="form.sbjb" ></el-input> -->
<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>
</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-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="24">
<el-form-item label="内容" ref="nr" prop="nr">
<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="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-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-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="制定整改方案" ref="zdzgfa" prop="zdzgfa">
<el-form-item label="整改完成日期" ref="zdzgfa" prop="zdzgfa">
<el-input :readonly="readonly" v-model="form.zdzgfa" ></el-input>
</el-form-item>
</el-col>
......@@ -49,11 +64,7 @@
<personSelector :label="form.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
</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="24">
......@@ -74,7 +85,6 @@
/* 赋值*/
this.form.zrr=localStorage.getItem('userid')
this.form.zrrName=localStorage.getItem('username')
this.form.flid=this.app.queryParams.flid
},
/* 组件名称*/
name: "aqgl/yhglYhjlEdit",
......@@ -90,6 +100,8 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
gkcs:'',
zgfa:'',
zrrName:'',
id:'',
......
src/views/dangerManagement/enterSafetyRecords/index.vue
View file @ 29dca19d
<template>
<div style="display: flex;">
<div class="min_full" style="width: 200px;border-right: 0px;">
<TreeBase :app='app' @selected='selectedTree' :dgtype='3' ></TreeBase>
</div>
<div class="min_full" style="width: calc(100% - 200px)">
<div class="min_full" >
<!-- 查询条件-->
<div class="search" v-condition >
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">事务类型:</span>
<RelSelect src='wf/common/wfstate' :match="{value:'id',label:'name'}" v-model='queryParams.operatype' ></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">开始日期:</span>
<el-date-picker value-format="timestamp" v-model="queryParams.ksrq"></el-date-picker>
......@@ -25,6 +15,18 @@
<span class="search-span">结束日期:</span>
<el-date-picker value-format="timestamp" v-model="queryParams.jsrq"></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<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">
<div class="search-item">
<span class="search-span">隐患类型:</span>
<RelSelect src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
</div>
</el-col>
</el-row>
......@@ -52,7 +54,7 @@
</div>
</div>
</div>
</template>
......@@ -88,34 +90,39 @@
baseUrl: '/aqgl/yhgl/yhjl',
/* 查询参数*/
queryParams: {
operatype:'W',
flid:'',
bmid:'',
ksrq:new Date().getTime()-1000*60*60*24*30,
jsrq:new Date().getTime()
},
/* 树的标题 */
treeTitle: '隐患分类',
treeDefaultProps: {
children: 'children',
label: 'name',
fatherId:'pid',
sonId:'id'
},
/* 表格标题对应参数*/
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: "fxd", fieldType: "ftString",width:300},
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
{label: "上报级别", prop: "sbjb", fieldType: "ftString",width:100},
{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: "sbjb", fieldType: "ftString",width:100},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "责任部门", prop: "bmid", fieldType: "ftString",width:192},
{label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
{label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
// {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: "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: "fcr", fieldType: "ftString",width:192},
/* 检查人 */
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
// {label: "处置人", prop: "czr", fieldType: "ftString",width:192},
......@@ -125,8 +132,8 @@
// {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: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
......
src/views/dangerManagement/queryDangerRecords/edit.vue
View file @ 29dca19d
......@@ -15,23 +15,28 @@
<el-input :readonly="readonly" v-model="form.fxd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<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-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="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-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> -->
<el-col :span="12">
<el-form-item label="制定整改方案" ref="zdzgfa" prop="zdzgfa">
<el-input :readonly="readonly" v-model="form.zdzgfa" ></el-input>
......@@ -43,11 +48,7 @@
<!-- <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 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">
......
src/views/dangerManagement/queryDangerRecords/index.vue
View file @ 29dca19d
......@@ -22,8 +22,10 @@
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">责任单位:</span>
<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> -->
</div>
</el-col>
<el-col :span="6" class="search-col">
......@@ -99,7 +101,7 @@
queryParams: {
ksrq:new Date().getTime()-1000*60*60*24*30,
jsrq:new Date().getTime(),
zrdw:'',
bmid:'',
zt:''
},
/* 树的标题 */
......@@ -113,9 +115,11 @@
{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: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "责任部门", prop: "bmid", fieldType: "ftString",width:192},
// {label: "责任部门", prop: "bmid", fieldType: "ftString",width:192},
{label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:120},
{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
{label: "隐患等级", prop: "dj", fieldType: "ftString",width:192},
......
src/views/dangerManagement/safetyDisposalRecord/edit.vue
View file @ 29dca19d
......@@ -15,17 +15,12 @@
<el-input :readonly="readonly" v-model="form.fxd" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<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">
<!-- <el-input :readonly="readonly" v-model="form.sbjb" ></el-input> -->
<RelSelect :readonly="readonly" style="width: 100%;" src='/aqgl/fxyk/fxpc/init/glcj' clearable :match="{value:'id',label:'name'}" v-model='form.sbjb' ></RelSelect>
<el-input style='width: 100%;' :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>
......@@ -34,8 +29,8 @@
</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 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">
......@@ -43,7 +38,7 @@
<personSelector :label="form.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
</el-form-item>
</el-col>
<el-col :span="12">
<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> -->
......
src/views/dangerManagement/safetyDisposalRecord/index.vue
View file @ 29dca19d
......@@ -106,9 +106,11 @@
{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
{label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
{label: "上报级别", prop: "yhsbdjName", fieldType: "ftString",width:100},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}},
{label: "内容", prop: "nr", fieldType: "ftString",width:300},
{label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
// {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},
......
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