Skip to content

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

修改

parent 95c7a5dd
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 103 deletions
src/views/dangerManagement/queryDangerRecords/edit.vue
View file @ 7311add0
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
this.form.sbrName=localStorage.getItem('username') this.form.sbrName=localStorage.getItem('username')
}, },
/* 组件名称*/ /* 组件名称*/
name: "aqgl/yhglYhjlEdit",
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/ /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() { data() {
......
src/views/riskPrecontrol/maintenanceRisk/edit.vue
View file @ 7311add0
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="事故时间" ref="sgrq" prop="sgrq"> <el-form-item label="事故时间" ref="sgrq" prop="sgrq">
<el-date-picker type="datetime" value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker> <el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
......
src/views/riskPrecontrol/maintenanceRiskTask/edit.vue
View file @ 7311add0
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="风险点" ref="fxd" prop="fxd"> <el-form-item label="风险点" ref="fxd" prop="fxd">
<el-input :readonly="true" v-model="form.fxdName" ></el-input> <el-input :readonly="true" v-model="form.fxd" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
......
src/views/riskPrecontrol/maintenanceRiskTask/index.vue
View file @ 7311add0
<template> <template>
<div class="min_full" style="height: 140vh;"> <!-- <div class="min_full" style="height: 140vh;"> -->
<Zdzrr :app='this' v-if="showDialog" ></Zdzrr>
<div class="min_full" style="height: 40%;">
<div class="min_full" >
<Zdzrr :app='this' v-if="showDialog&&DialogName=='指定检查人'" ></Zdzrr>
<yhContent :app='this' v-if="showDialog&&DialogName=='关联隐患'" ></yhContent>
<!-- 查询条件--> <!-- 查询条件-->
<div class="search" v-condition> <div class="search" v-condition>
<SearchButton :app='app'></SearchButton> <SearchButton :app='app'></SearchButton>
...@@ -54,12 +55,17 @@ ...@@ -54,12 +55,17 @@
<div class="tablePagers"> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'> @getRow='getRow'>
<template slot="tabCustom">
<el-table-column label="关联隐患" width="90" header-align="center" >
<template slot-scope="scope" >
<span @click="watchglyh(scope.row)" style="color: cornflowerblue;cursor: pointer;line-height: 30px;text-align: center;width: 70px;display: inline-block;">查看</span>
</template>
</el-table-column>
</template>
</TablePager> </TablePager>
</div> </div>
</div> </div>
<div class="min_full" style="height: 60%;padding: 10px;"> <!-- <div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs -->
<el-tabs v-model="activeName" > <el-tabs v-model="activeName" >
<el-tab-pane label="检查标准" name="first" > <el-tab-pane label="检查标准" name="first" >
<Details ref="Details" /> <Details ref="Details" />
...@@ -70,11 +76,10 @@ ...@@ -70,11 +76,10 @@
<el-tab-pane label="相关隐患" name="third" > <el-tab-pane label="相关隐患" name="third" >
<yhContent :vMain='this' ref="yhContent" /> <yhContent :vMain='this' ref="yhContent" />
</el-tab-pane> </el-tab-pane>
<!-- -->
</el-tabs> </el-tabs>
</div> </div> -->
</div> <!-- </div> -->
</template> </template>
<script> <script>
...@@ -150,36 +155,37 @@ import Zdzrr from './zdzrr' ...@@ -150,36 +155,37 @@ import Zdzrr from './zdzrr'
{label: "风险点", prop: "fxd", fieldType: "ftString",width:192}, {label: "风险点", prop: "fxd", fieldType: "ftString",width:192},
{label: "公司", prop: "gsName", fieldType: "ftString",width:192}, {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "班组", prop: "bzName", fieldType: "ftString",width:192}, {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
// {label: "维护方式", prop: "jcrName", fieldType: "ftString",width:192},
// {label: "备注", prop: "bz", 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: "bcid", fieldType: "ftString",width:192},
], ],
timer:false, timer:false,
} }
}, },
methods: { methods: {
watchglyh(row){
this.showDialog = true
this.DialogTitle='关联隐患'
this.DialogName='关联隐患'
console.log(row)
},
zdzrr(){ zdzrr(){
if (this.app.selectOne || this.app.clickOne) { if (this.app.selectOne || this.app.clickOne) {
this.showDialog = true this.showDialog = true
this.DialogTitle='指定检查人'
this.DialogName='指定检查人'
} else { } else {
this.$warning('请选中一行操作'); this.$warning('请选中一行操作');
} }
}, },
getRow: function(e) { getRow: function(e) {
this.rowItem = e this.rowItem = e
this.$refs.Details.queryParams.fxbzid=e.fxbzid // this.$refs.Details.queryParams.fxbzid=e.fxbzid
this.$refs.Content.queryParams.mid=e.id // this.$refs.Content.queryParams.mid=e.id
/* 查询关联隐患*/ // this.$refs.yhContent.queryParams.fxd=e.id
this.$refs.yhContent.queryParams.fxd=e.id // this.$nextTick(()=>{
this.$nextTick(()=>{ // this.$refs.Details.query()
this.$refs.Details.query() // this.$refs.Content.$refs['TablePager'].pageQuery()
this.$refs.Content.$refs['TablePager'].pageQuery() // this.$refs.yhContent.$refs['TablePager'].pageQuery()
this.$refs.yhContent.$refs['TablePager'].pageQuery() // })
})
}, },
/* 基础查询*/ /* 基础查询*/
/* 基础查询*/ /* 基础查询*/
......
src/views/riskPrecontrol/maintenanceRiskTask/yhContent.vue
View file @ 7311add0
<template> <template>
<DefaultDialog :app='app'>
<!-- v-show='queryParams.mid'--> <!-- v-show='queryParams.mid'-->
<div class="min_full" v-show='queryParams.fxd' style="height: calc(84vh - 75px);"> <div class="min_full" slot="form" style="height: calc(84vh - 75px);border: 0px;">
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <el-row class="tool-bar">
<PrintButton :app='app'></PrintButton> <ViewButton ref="view" :app='this'></ViewButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
@getRow='getRow'> @getRow='getRow'>
<!-- 自定义列 slot="tabCustom",格式参照elementUi,自定义事件用this.$refs['TablePager']调用/或者v-slot通信/-->
</TablePager> </TablePager>
</div> </div>
</div> </div>
</DefaultDialog>
</template> </template>
<script> <script>
...@@ -30,86 +25,86 @@ ...@@ -30,86 +25,86 @@
doDelete doDelete
} from "@/api/dangerManagement/enterSafetyRecords.js" } from "@/api/dangerManagement/enterSafetyRecords.js"
/* edit页面*/ /* edit页面*/
import Edit from './contentEdit.vue' import Edit from './yhContentEdit.vue'
import {tableMixin} from 'common' import {tableMixin_noapp} from 'common'
export default { export default {
props:['vMain'], props:['app'],
mixins: [tableMixin], mixins: [tableMixin_noapp],
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
// await this.$asRun( this.$nextTick(()=>{
// [QueryApptype(), this.$refs['TablePager'].pageQuery()
// res => { })
// var data = res['data']['records'];
// let typeMap = []
// for (var i in data) {
// typeMap[data[i].id] = data[i].name
// }
// this.systemType = data
// this.typeMap = typeMap
// }
// ]
// )
// this.$refs['TablePager'].pageQuery()
}, },
data() { data() {
return { return {
/*需要的额外参数 */ /*需要的额外参数 */
typeMap: [], typeMap: [],
systemType: [], systemType: [],
baseUrl: 'aqgl/fxyk/fxpcmx', baseUrl: '/aqgl/yhgl/yhjl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
fxd:''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label: "状态", prop: "ztName", fieldType: "ftString",width:60}, {label: "状态", prop: "ztName", fieldType: "ftString",width:60},
{label: "公司", prop: "gsid", fieldType: "ftString",width:192,transform:{ {label: "公司", prop: "gsid", fieldType: "ftString",width:192,transform:{
url:'jcsj/common/bm/queryGs',label:'bmmc',value:'id' url:'jcsj/common/bm/queryGs',label:'bmmc',value:'id'
}}, }},
{label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{ {label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id' url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id'
}}, }},
{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"}, //
{label: "风险点", prop: "fxdName", fieldType: "ftString",width:300}, // {label: "状态", prop: "zt", fieldType: "ftString",transform:{
{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300}, // url:'aqgl/yhgl/yhjl/init/zt',label:'name',value:'id'
{label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{ // }},
url:'aqgl/yhgl/yhfl/query',label:'name',value:'id' // {label: "整改说明", prop: "clff", fieldType: "ftString",width:300},
}}, // {label: "整改完成时间", prop: "clsj", fieldType: "ftDateTime"},
{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: "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: "yqzgsj", fieldType: "ftDateTime"},
/* 要求整改完成时间 */
{label: "处理人", prop: "clrName", fieldType: "ftString",width:192}, {label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"}, /* */
// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300}, {label: "整改日期", prop: "clsj", fieldType: "ftDateTime"},
{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192}, {label: "复查日期", prop: "fcsj", fieldType: "ftDateTime"},
{label: "上报人", prop: "sbrName", fieldType: "ftString",width:192}, /* */
/* 检查人 */ {label: "风险点", prop: "fxdName", fieldType: "ftString",width:300},
// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"}, {label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300}, {label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{
// {label: "处置人", prop: "czr", fieldType: "ftString",width:192}, url:'aqgl/yhgl/yhfl/query',label:'name',value:'id'
// {label: "处置时间", prop: "czsj", fieldType: "ftDateTime"}, }},
// {label: "处置意见", prop: "czyj", fieldType: "ftString",width:300}, {label: "隐患等级", prop: "dj", fieldType: "ftString",width:192,transform:{
// {label: "状态", prop: "zt", fieldType: "ftString",width:6}, url:'aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'
// {label: "附件数", prop: "attachcount", fieldType: "int"}, }},
{label: "备注", prop: "bz", fieldType: "ftString",width:300}, {label: "内容", prop: "nr", fieldType: "ftString",width:300},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300}, // {label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
{label: "维护人", prop: "whr", fieldType: "ftString"}, // {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}, {label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
// {label: "创建人", prop: "cjr", fieldType: "ftString"}, {label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, {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: "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"},
// {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: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
} }
}, },
methods: { methods: {
......
src/views/riskPrecontrol/maintenanceRiskTask/yhContentEdit.vue 0 → 100644
View file @ 7311add0
<template>
<RelDialog :stopEvent='false' :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容，slot=form必写-->
<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">
<el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fxrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="风险点" ref="fxd" prop="fxd">
<RelSelect linkage :linkParams="{gsid:form.gsid}" style="width: 100%;" :readonly="readonly" src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='form.fxd' ></RelSelect>
</el-form-item>
</el-col>
<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="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-col :span="12">
<el-form-item label="班组" ref="bmid" prop="bmid">
<RelSelect linkage :linkParams="{pid:form.gsid}" :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-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-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-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="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">
<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>
</el-form>
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
/* 赋值*/
},
/* 组件名称*/
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化，根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
fcsm:'',
clff:'',
sbr:'',
sbrName:'',
gkcs:'',
zgfa:'',
zrrName:'',
id:'',
fxrq:new Date().getTime(),
fxd:'',
yhdd:'',
sbjb:'',
nr:'',
bmid:'',
zdzgfa:'',
zrr:'',
dj:'',
flid:'',
clr:'',
yqzgsj:new Date().getTime(),
clsj:new Date().getTime(),
clff:'',
fcr:'',
fcsj:new Date().getTime(),
fcjg:'',
czr:'',
czsj:new Date().getTime(),
czyj:'',
zt:'',
attachcount:'',
bz:'',
wfid:'',
wfinstid:'',
wfpid:'',
wfpname:'',
wfwuserid:'',
wfwusername:'',
wfhuserid:'',
wfhusername:'',
whrid:'',
whr:'',
whsj:new Date().getTime(),
cjrid:'',
cjr:'',
cjsj:new Date().getTime(),
sysversion:'',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
}
}
},
methods: {
sbrSelected(row){
this.form.sbr=row.id
}
}
}
</script>
<style scoped lang="scss">
</style>
src/views/riskPrecontrol/queryRisk/edit.vue
View file @ 7311add0
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="事故时间" ref="sgrq" prop="sgrq"> <el-form-item label="事故时间" ref="sgrq" prop="sgrq">
<el-date-picker type="datetime" value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker> <el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" v-model="form.sgrq" ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
......
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