Commit 1507f5de authored by 李苏's avatar 李苏 💬

nroa

parent e8d5f4b1
<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-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动时间" ref="roleid" prop="roleid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名称" ref="roleid" prop="roleid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动周期" ref="roleid" prop="roleid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="组织单位" ref="roleid" prop="roleid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="活动内容">
<el-input type="textarea"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="活动结论">
<el-input type="textarea"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="改进措施">
<el-input type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 按钮重写, -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里,根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div> -->
</RelDialog>
<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-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动日期" ref="hdrq" prop="hdrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.hdrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="频次记录" ref="pcjl" prop="pcjl">
<el-input type="number" :readonly="readonly" v-model="form.pcjl" ></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 style="width: 100%;" src='kzzx/bm/query' :readonly="readonly" :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名称" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="活动内容" ref="content" prop="content">
<el-input type="textarea" :readonly="readonly" v-model="form.content" ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="活动结论" ref="hdjl" prop="hdjl">
<el-input type="textarea" :readonly="readonly" v-model="form.hdjl" ></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></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>
</template>
<script>
import {editMixin} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
/* 组件名称*/
name: 'roleManagementEdit',
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
import {editMixin} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
data() {
return {
},
/* 组件名称*/
name: "aqglRcglAqhdEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化,根据需求*/
systemType: [],
/* 额外初始化,根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
roleid: '',
rolename: '',
bz: "",
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
//ID
id:'',
//活动日期
hdrq:new Date().getTime(),
//频次记录
pcjl:'',
//组织部门
bmid:'',
//活动名称
name:'',
//活动内容
content:'',
//活动结论
hdjl:'',
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
}
}
},
/* form提交时的规则,具体规则参考官网*/
rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
}
}
},
methods: {
methods: {
}
}
}
</script>
<style scoped lang="scss">
......
......@@ -8,13 +8,13 @@
<el-col :span="8" class="search-col">
<div class="search-item">
<span class="search-span">日期:</span>
<el-date-picker></el-date-picker>
<el-date-picker v-model="queryParams.date" ></el-date-picker>
</div>
</el-col>
<el-col :span="8" class="search-col">
<div class="search-item">
<span class="search-span">部门:</span>
<el-input></el-input>
<RelSelect src='kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div>
</el-col>
</el-row>
......@@ -38,15 +38,6 @@
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
<template slot="tabCustom">
<el-table-column label="启用/停用" width="90" header-align="center" >
<template slot-scope="scope">
<el-switch @click.native="setEnable(scope.row.id)" :value='tybz(scope)' style="width: 80px;justify-content: center;"
active-color="#13ce66" inactive-color="#eee">
</el-switch>
</template>
</el-table-column>
</template>
</TablePager>
</div>
......@@ -54,15 +45,14 @@
</template>
<script>
/* 引入需要的接口*/
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/daily/activityRecord.js';
/* edit页面*/
import Edit from './edit'
import {
......@@ -85,85 +75,44 @@
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
baseUrl: '/aqgl/rcgl/aqhd',
/* 查询参数*/
queryParams: {
ksrq: '',
jsrq: ''
date: new Date().getTime(),
bmid: ''
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
label: '活动时间',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '活动名称',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '活动周期',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '组织单位',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '活动内容',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '活动结论',
...this.$common('ftDateTime')
}
]
}
},
/* 表格标题对应参数*/
tableTitle: [
{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
{label: "频次记录", prop: "pcjl", fieldType: "ftString",width:180},
// {label: "组织部门", prop: "bmid", fieldType: "ftString",width:192},
{label: "组织部门", prop: "bmName", fieldType: "ftString",width:192},
{label: "活动名称", prop: "name", fieldType: "ftString",width:600},
{label: "活动内容", prop: "content", fieldType: "ftString",width:600},
{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:600},
// {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"},
]
}},
methods: {
tybz(a) {
let nTy = false
nTy = (a.row.tybz == 'N' ? true : false)
return nTy
},
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
},
/* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
......
This diff is collapsed.
<template>
<div class="form-detail">
<div class="descript">
有限空间安全作业申请
吊装作业
</div>
<el-descriptions class="margin-top" :column="2" border>
......@@ -98,6 +98,6 @@
overflow-x: hidden;
}
.descript{
text-align: center;line-height: 30px;font-size: 14px;color: #666;font-weight: 800;
text-align: center;line-height: 30px;font-size: 14px;color: #666;font-weight: 800;padding-bottom: 10px;
}
</style>
......@@ -9,15 +9,21 @@
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">岗位:</span>
<el-input style="width:60% ;"></el-input>
<span class="search-span">日期:</span>
<el-date-picker v-model="queryParams.date" ></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">设备设施风险点:</span>
<el-input></el-input>
<span class="search-span">作业类型:</span>
<RelSelect src='/aqgl/rcgl/fcgzy/init/zylx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">风险级别:</span>
<RelSelect src='aqgl/fxyk/fxpc/init/wxdj' clearable :match="{value:'id',label:'name'}" v-model='queryParams.fxjb' ></RelSelect>
</div>
</el-col>
</el-row>
......@@ -48,20 +54,29 @@
<div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs -->
<el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane label="曝光亮相关" name="first" >
<Exposure />
<el-tab-pane v-if="sqxList.indexOf('DZ')!=-1" label="吊装作业" name="DZ" >
<Exposure />
</el-tab-pane>
<el-tab-pane label="安全补课关" name="second">
<SafetyCourse />
<el-tab-pane v-if="sqxList.indexOf('DL')!=-1" label="断路作业" name="DL">
<!-- <SafetyCourse /> -->
</el-tab-pane>
<el-tab-pane label="反思检查关" name="third">
<Reflect />
<el-tab-pane v-if="sqxList.indexOf('YXKJ')!=-1" label="有限空间作业" name="YXKJ">
<!-- <Reflect /> -->
</el-tab-pane>
<el-tab-pane label="领导谈话关" name="fourth">
<Leadership />
<el-tab-pane v-if="sqxList.indexOf('DHZY')!=-1" label="动火作业" name="DHZY">
<!-- <Leadership /> -->
</el-tab-pane>
<el-tab-pane label="家属协管关" name="fifth">
<Family />
<el-tab-pane v-if="sqxList.indexOf('LSYD')!=-1" label="临时用电" name="LSYD">
<!-- <Family /> -->
</el-tab-pane>
<el-tab-pane v-if="sqxList.indexOf('DTZY')!=-1" label="动土作业" name="DTZY">
<!-- <Family /> -->
</el-tab-pane>
<el-tab-pane v-if="sqxList.indexOf('GCAQZY')!=-1" label="高处安全作业" name="GCAQZY">
<!-- <Family /> -->
</el-tab-pane>
<el-tab-pane v-if="sqxList.indexOf('MQMB')!=-1" label="煤气盲板抽堵作业" name="MQMB">
<!-- <Family /> -->
</el-tab-pane>
</el-tabs>
</div>
......@@ -71,14 +86,12 @@
<script>
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
import {
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/daily/nroa.js';
/* edit页面*/
import Edit from './edit'
import Exposure from './exposure.vue'
......@@ -94,126 +107,75 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
console.log(_)
this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
},
data() {
return {
activeName: 'first',
return {
sqxList:[],
activeName: '',
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
baseUrl: '/aqgl/rcgl/fcgzy',
/* 查询参数*/
queryParams: {
ksrq: '',
jsrq: ''
date: new Date().getTime(),
flid: '',
fxjb:''
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
label: '报送日期',
show:false,
fieldType:'ftDateTime',
width: '100',
align:'left'
},
{
prop: 'whsj',
label: '作业类型',
...this.$common('ftDateTime')
},
{
prop: 'whr',
label: '计划开始作业时间',
width: '100'
},
{
prop: 'whr',
label: '地点',
width: '100'
},
{
prop: 'whr',
label: '计划完成作业时间',
width: '100'
},
{
prop: 'whr',
label: '计划作业时长',
width: '100'
},
{
prop: 'whr',
label: '作业项目',
width: '100'
},
{
prop: 'whr',
label: '作业地点',
width: '100'
},
{
prop: 'whr',
label: '风险级别',
width: '100'
},
{
prop: 'whr',
label: '作业单位',
width: '100'
},
{
prop: 'whr',
label: '作业申请',
width: '100'
}
{label: "申请单号", prop: "djid", fieldType: "ftString",width:120},
{label: "申请日期", prop: "sqrq", fieldType: "ftDateTime"},
{label: "作业类型", prop: "flid", fieldType: "ftString",width:300},
{label: "开始时间", prop: "kssj", fieldType: "ftDateTime"},
{label: "结束时间", prop: "jssj", fieldType: "ftDateTime"},
{label: "作业时长", prop: "zysc", fieldType: "float"},
{label: "作业项目", prop: "zyxm", fieldType: "ftString",width:300},
{label: "作业地点", prop: "zydd", fieldType: "ftString",width:300},
{label: "施工单位", prop: "sgdw", fieldType: "ftString",width:300},
{label: "风险级别", prop: "fxjb", fieldType: "ftString",width:120},
{label: "危害因素", prop: "whys", fieldType: "ftString",width:300},
{label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
{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: "zt", fieldType: "ftString",width:6},
{label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
]
}
},
methods: {
methods: {
/* 获取当前点击的数据*/
getRow: function(e) {
this.rowItem = e
this.sqxList=e.sqx.split(',')
if(this.sqxList.length>0){
this.activeName=this.sqxList[0]
}else{
this.activeName=""
}
},
handleClick(val){
console.log(val,'val')
},
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
},
/* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
/* 启用停用*/
},
components: {
......
......@@ -29,40 +29,40 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="排查岗位" ref="pcgwid" prop="pcgwid">
<RelSelect src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.pcgwid' ></RelSelect>
<RelSelect style="width: 100%;" src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.pcgwid' ></RelSelect>
</el-form-item>
</el-col>
</el-col>
<el-col :span="12">
<el-form-item label="风险类型" ref="fxlx" prop="fxlx">
<RelSelect src='/aqgl/fxyk/shlx/query' clearable :match="{value:'id',label:'name'}" v-model='form.fxlx' ></RelSelect>
<RelSelect style="width: 100%;" src='/aqgl/fxyk/shlx/query' clearable :match="{value:'id',label:'name'}" v-model='form.fxlx' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.fxlx" ></el-input> -->
</el-form-item>
<el-col :span="12">
</el-col>
<el-col :span="24">
<el-form-item label="危害因素" ref="whys" prop="whys">
<el-input :readonly="readonly" v-model="form.whys" ></el-input>
<el-input type="textarea" rows="6" :readonly="readonly" v-model="form.whys" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="管控措施" ref="gkcs" prop="gkcs">
<el-input :readonly="readonly" v-model="form.gkcs" ></el-input>
<el-input type="textarea" rows="6" :readonly="readonly" v-model="form.gkcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<!-- <el-row :gutter="20">
<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-row> -->
</el-form>
</RelDialog>
</template>
......@@ -143,5 +143,3 @@
<style scoped lang="scss">
</style>
<template>
<div class="min_full">
<!-- 查询条件-->
<div class="search" v-condition>
<!-- <div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="12" class="search-col">
......@@ -11,7 +11,7 @@
</div>
</el-col>
</el-row>
</div>
</div> -->
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
......@@ -19,7 +19,7 @@
<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>
<!-- 额外按钮-->
......@@ -76,7 +76,7 @@
tableTitle: [
{label: "作业活动", prop: "zyhd", fieldType: "ftString",width:300},
{label: "事故后果", prop: "sghg", fieldType: "ftString",width:300},
{label: "风险登记", prop: "fxdj", fieldType: "ftString",width:60},
{label: "风险登记", prop: "fxdj", fieldType: "ftString",width:100},
{label: "作业地点", prop: "zydd", fieldType: "ftString",width:300},
// {label: "排查岗位ID", prop: "pcgwid", fieldType: "ftString",width:192},
{label: "排查岗位", prop: "pcgwName", fieldType: "ftString",width:192},
......@@ -114,4 +114,3 @@
<style scoped>
</style>
<template>
<div class="min_full">
<!-- 查询条件-->
<div class="search" v-condition>
<!-- <div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="12" class="search-col">
......@@ -11,15 +11,15 @@
</div>
</el-col>
</el-row>
</div>
</div> -->
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<!-- <PrintButton :app='app'></PrintButton> -->
<ViewButton ref="view" :app='app'></ViewButton>
<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>
<!-- 额外按钮-->
......@@ -108,4 +108,3 @@
<style scoped>
</style>
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